diff --git a/Docs/Schemas/DenominationConfigJson.schema.json b/Docs/Schemas/DenominationConfigJson.schema.json
index a24185884d..cfde140100 100644
--- a/Docs/Schemas/DenominationConfigJson.schema.json
+++ b/Docs/Schemas/DenominationConfigJson.schema.json
@@ -59,6 +59,14 @@
       ],
       "additionalProperties": false
     },
+    "Record<string,string>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object",
+      "additionalProperties": false
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -122,10 +130,6 @@
         "canonicalDenomination"
       ],
       "additionalProperties": false
-    },
-    "Record<string,string>": {
-      "type": "object",
-      "additionalProperties": false
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/Docs/Schemas/DenominationConfigJsonJSC.ts b/Docs/Schemas/DenominationConfigJsonJSC.ts
index 34b627f58a..fd7b2494f3 100644
--- a/Docs/Schemas/DenominationConfigJsonJSC.ts
+++ b/Docs/Schemas/DenominationConfigJsonJSC.ts
@@ -57,6 +57,12 @@ export default {
         "or"
       ]
     },
+    "Record<string,string>": {
+      "type": "object"
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object"
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -119,9 +125,6 @@ export default {
       "required": [
         "canonicalDenomination"
       ]
-    },
-    "Record<string,string>": {
-      "type": "object"
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#"
diff --git a/Docs/Schemas/LayerConfigJson.schema.json b/Docs/Schemas/LayerConfigJson.schema.json
index 4f052337cf..e7eb813fc4 100644
--- a/Docs/Schemas/LayerConfigJson.schema.json
+++ b/Docs/Schemas/LayerConfigJson.schema.json
@@ -7,90 +7,80 @@
       "type": "string"
     },
     "name": {
-      "description": "The name of this layer\nUsed in the layer control panel and the 'Personal theme'.\n\nIf not given, will be hidden (and thus not toggable) in the layer control"
-    },
-    "description": {
-      "description": "A description for this layer.\nShown in the layer selections and in the personel theme"
-    },
-    "source": {
-      "description": "This determines where the data for the layer is fetched: from OSM or from an external geojson dataset.\n\nIf no 'geojson' is defined, data will be fetched from overpass and the OSM-API.\n\nEvery source _must_ define which tags _must_ be present in order to be picked up.",
+      "description": "The name of this layer\nUsed in the layer control panel and the 'Personal theme'.\n\nIf not given, will be hidden (and thus not toggable) in the layer control",
       "anyOf": [
         {
-          "allOf": [
-            {
-              "type": "object",
-              "properties": {
-                "osmTags": {
-                  "$ref": "#/definitions/TagConfigJson",
-                  "description": "Every source must set which tags have to be present in order to load the given layer."
-                },
-                "maxCacheAge": {
-                  "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
-                  "type": "number"
-                }
-              },
-              "required": [
-                "osmTags"
-              ]
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "description": {
+      "description": "A description for this layer.\nShown in the layer selections and in the personel theme",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "source": {
+      "description": "This determines where the data for the layer is fetched: from OSM or from an external geojson dataset.\n\nIf no 'geojson' is defined, data will be fetched from overpass and the OSM-API.\n\nEvery source _must_ define which tags _must_ be present in order to be picked up.\n\nNote: a source must always be defined. 'special' is only allowed if this is a builtin-layer",
+      "anyOf": [
+        {
+          "type": "object",
+          "properties": {
+            "osmTags": {
+              "$ref": "#/definitions/TagConfigJson",
+              "description": "Every source must set which tags have to be present in order to load the given layer."
             },
-            {
-              "type": "object",
-              "properties": {
-                "overpassScript": {
-                  "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible:\n```\n\"source\": {\n  \"overpassScript\":\n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
-                  "type": "string"
-                }
-              }
+            "maxCacheAge": {
+              "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
+              "type": "number"
             }
+          },
+          "required": [
+            "osmTags"
           ]
         },
         {
-          "allOf": [
-            {
-              "type": "object",
-              "properties": {
-                "osmTags": {
-                  "$ref": "#/definitions/TagConfigJson",
-                  "description": "Every source must set which tags have to be present in order to load the given layer."
-                },
-                "maxCacheAge": {
-                  "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
-                  "type": "number"
-                }
-              },
-              "required": [
-                "osmTags"
-              ]
+          "type": "object",
+          "properties": {
+            "geoJson": {
+              "description": "The actual source of the data to load, if loaded via geojson.\n\n# A single geojson-file\nsource: {geoJson: \"https://my.source.net/some-geo-data.geojson\"}\n fetches a geojson from a third party source\n\n# A tiled geojson source\nsource: {geoJson: \"https://my.source.net/some-tile-geojson-{layer}-{z}-{x}-{y}.geojson\", geoJsonZoomLevel: 14}\n to use a tiled geojson source. The web server must offer multiple geojsons. {z}, {x} and {y} are substituted by the location; {layer} is substituted with the id of the loaded layer\n\nSome API's use a BBOX instead of a tile, this can be used by specifying {y_min}, {y_max}, {x_min} and {x_max}",
+              "type": "string"
             },
-            {
-              "type": "object",
-              "properties": {
-                "geoJson": {
-                  "description": "The actual source of the data to load, if loaded via geojson.\n\n# A single geojson-file\nsource: {geoJson: \"https://my.source.net/some-geo-data.geojson\"}\n fetches a geojson from a third party source\n\n# A tiled geojson source\nsource: {geoJson: \"https://my.source.net/some-tile-geojson-{layer}-{z}-{x}-{y}.geojson\", geoJsonZoomLevel: 14}\n to use a tiled geojson source. The web server must offer multiple geojsons. {z}, {x} and {y} are substituted by the location; {layer} is substituted with the id of the loaded layer\n\nSome API's use a BBOX instead of a tile, this can be used by specifying {y_min}, {y_max}, {x_min} and {x_max}",
-                  "type": "string"
-                },
-                "geoJsonZoomLevel": {
-                  "description": "To load a tiled geojson layer, set the zoomlevel of the tiles",
-                  "type": "number"
-                },
-                "isOsmCache": {
-                  "description": "Indicates that the upstream geojson data is OSM-derived.\nUseful for e.g. merging or for scripts generating this cache",
-                  "type": "boolean"
-                },
-                "mercatorCrs": {
-                  "description": "Some API's use a mercator-projection (EPSG:900913) instead of WGS84. Set the flag `mercatorCrs: true`  in the source for this",
-                  "type": "boolean"
-                },
-                "idKey": {
-                  "description": "Some API's have an id-field, but give it a different name.\nSetting this key will rename this field into 'id'",
-                  "type": "string"
-                }
-              },
-              "required": [
-                "geoJson"
-              ]
+            "geoJsonZoomLevel": {
+              "description": "To load a tiled geojson layer, set the zoomlevel of the tiles",
+              "type": "number"
+            },
+            "isOsmCache": {
+              "description": "Indicates that the upstream geojson data is OSM-derived.\nUseful for e.g. merging or for scripts generating this cache",
+              "type": "boolean"
+            },
+            "mercatorCrs": {
+              "description": "Some API's use a mercator-projection (EPSG:900913) instead of WGS84. Set the flag `mercatorCrs: true`  in the source for this",
+              "type": "boolean"
+            },
+            "idKey": {
+              "description": "Some API's have an id-field, but give it a different name.\nSetting this key will rename this field into 'id'",
+              "type": "string"
             }
+          },
+          "required": [
+            "geoJson"
           ]
+        },
+        {
+          "enum": [
+            "special",
+            "special:library"
+          ],
+          "type": "string"
         }
       ]
     },
@@ -214,7 +204,15 @@
         "type": "object",
         "properties": {
           "title": {
-            "description": "The title - shown on the 'add-new'-button.\n\nThis should include the article of the noun, e.g. 'a hydrant', 'a bicycle pump'.\nThis text will be inserted into `Add {category} here`, becoming `Add a hydrant here`.\n\nDo _not_ indicate 'new': 'add a new shop here' is incorrect, as the shop might have existed forever, it could just be unmapped!"
+            "description": "The title - shown on the 'add-new'-button.\n\nThis should include the article of the noun, e.g. 'a hydrant', 'a bicycle pump'.\nThis text will be inserted into `Add {category} here`, becoming `Add a hydrant here`.\n\nDo _not_ indicate 'new': 'add a new shop here' is incorrect, as the shop might have existed forever, it could just be unmapped!",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/Record<string,string>"
+              },
+              {
+                "type": "string"
+              }
+            ]
           },
           "tags": {
             "description": "The tags to add. It determines the icon too",
@@ -224,7 +222,15 @@
             }
           },
           "description": {
-            "description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)"
+            "description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/Record<string,string>"
+              },
+              {
+                "type": "string"
+              }
+            ]
           },
           "exampleImages": {
             "description": "Example images, which show real-life pictures of what such a feature might look like\n\nType: image",
@@ -299,6 +305,9 @@
           {
             "type": "object",
             "properties": {
+              "id": {
+                "type": "string"
+              },
               "builtin": {
                 "anyOf": [
                   {
@@ -321,28 +330,6 @@
               "override"
             ]
           },
-          {
-            "type": "object",
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "builtin": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              },
-              "override": {
-                "$ref": "#/definitions/Partial<QuestionableTagRenderingConfigJson>"
-              }
-            },
-            "required": [
-              "builtin",
-              "id",
-              "override"
-            ]
-          },
           {
             "allOf": [
               {
@@ -507,6 +494,14 @@
       ],
       "additionalProperties": false
     },
+    "Record<string,string>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object",
+      "additionalProperties": false
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -571,10 +566,6 @@
       ],
       "additionalProperties": false
     },
-    "Record<string,string>": {
-      "type": "object",
-      "additionalProperties": false
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -583,10 +574,6 @@
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -594,11 +581,67 @@
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -616,6 +659,22 @@
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -640,7 +699,15 @@
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
@@ -796,7 +863,7 @@
       "type": "object",
       "properties": {
         "location": {
-          "description": "All the locations that this point should be rendered at.\nUsing `location: [\"point\", \"centroid\"] will always render centerpoint.\n'projected_centerpoint' will show an item on the line itself, near the middle of the line. (LineStrings only)",
+          "description": "All the locations that this point should be rendered at.\nPossible values are:\n- `point`: only renders points at their location\n- `centroid`: show a symbol at the centerpoint of a (multi)Linestring and (multi)polygon. Points will _not_ be rendered with this\n- `projected_centerpoint`: Only on (multi)linestrings: calculate the centerpoint and snap it to the way\n- `start` and `end`: only on linestrings: add a point to the first/last coordinate of the LineString",
           "type": "array",
           "items": {
             "type": "string"
@@ -875,7 +942,7 @@
           ]
         },
         "css": {
-          "description": "A snippet of css code",
+          "description": "A snippet of css code which is applied onto the container of the entire marker",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -886,7 +953,7 @@
           ]
         },
         "cssClasses": {
-          "description": "A snippet of css-classes. They can be space-separated",
+          "description": "A snippet of css-classes which are applied onto the container of the entire marker. They can be space-separated",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -895,6 +962,58 @@
               "type": "string"
             }
           ]
+        },
+        "labelCss": {
+          "description": "Css that is applied onto the label",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "labelCssClasses": {
+          "description": "Css classes that are applied onto the label; can be space-separated",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "pitchAlignment": {
+          "description": "If the map is pitched, the marker will stay parallel to the screen.\nSet to 'map' if you want to put it flattened on the map",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "enum": [
+                "canvas",
+                "map"
+              ],
+              "type": "string"
+            }
+          ]
+        },
+        "rotationAlignment": {
+          "description": "If the map is rotated, the icon will still point to the north if no rotation was applied",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "enum": [
+                "canvas",
+                "map"
+              ],
+              "type": "string"
+            }
+          ]
         }
       },
       "required": [
@@ -1101,7 +1220,7 @@
               }
             },
             "inline": {
-              "description": "When set, influences the way a question is asked.\nInstead of showing a full-widht text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.",
+              "description": "When set, influences the way a question is asked.\nInstead of showing a full-width text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.\nNote that this will be set automatically if no special elements are present.",
               "type": "boolean"
             },
             "default": {
@@ -1128,10 +1247,6 @@
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -1139,11 +1254,67 @@
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -1160,6 +1331,22 @@
               "type": "string"
             }
           ]
+        },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
         }
       },
       "additionalProperties": false
@@ -1216,7 +1403,7 @@
               }
             },
             "inline": {
-              "description": "When set, influences the way a question is asked.\nInstead of showing a full-widht text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.",
+              "description": "When set, influences the way a question is asked.\nInstead of showing a full-width text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.\nNote that this will be set automatically if no special elements are present.",
               "type": "boolean"
             },
             "default": {
@@ -1243,10 +1430,6 @@
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -1254,11 +1437,67 @@
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -1275,6 +1514,22 @@
               "type": "string"
             }
           ]
+        },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
         }
       },
       "additionalProperties": false
diff --git a/Docs/Schemas/LayerConfigJsonJSC.ts b/Docs/Schemas/LayerConfigJsonJSC.ts
index b03cc5a5db..4eaf333efc 100644
--- a/Docs/Schemas/LayerConfigJsonJSC.ts
+++ b/Docs/Schemas/LayerConfigJsonJSC.ts
@@ -7,90 +7,80 @@ export default {
       "type": "string"
     },
     "name": {
-      "description": "The name of this layer\nUsed in the layer control panel and the 'Personal theme'.\n\nIf not given, will be hidden (and thus not toggable) in the layer control"
-    },
-    "description": {
-      "description": "A description for this layer.\nShown in the layer selections and in the personel theme"
-    },
-    "source": {
-      "description": "This determines where the data for the layer is fetched: from OSM or from an external geojson dataset.\n\nIf no 'geojson' is defined, data will be fetched from overpass and the OSM-API.\n\nEvery source _must_ define which tags _must_ be present in order to be picked up.",
+      "description": "The name of this layer\nUsed in the layer control panel and the 'Personal theme'.\n\nIf not given, will be hidden (and thus not toggable) in the layer control",
       "anyOf": [
         {
-          "allOf": [
-            {
-              "type": "object",
-              "properties": {
-                "osmTags": {
-                  "$ref": "#/definitions/TagConfigJson",
-                  "description": "Every source must set which tags have to be present in order to load the given layer."
-                },
-                "maxCacheAge": {
-                  "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
-                  "type": "number"
-                }
-              },
-              "required": [
-                "osmTags"
-              ]
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "description": {
+      "description": "A description for this layer.\nShown in the layer selections and in the personel theme",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "source": {
+      "description": "This determines where the data for the layer is fetched: from OSM or from an external geojson dataset.\n\nIf no 'geojson' is defined, data will be fetched from overpass and the OSM-API.\n\nEvery source _must_ define which tags _must_ be present in order to be picked up.\n\nNote: a source must always be defined. 'special' is only allowed if this is a builtin-layer",
+      "anyOf": [
+        {
+          "type": "object",
+          "properties": {
+            "osmTags": {
+              "$ref": "#/definitions/TagConfigJson",
+              "description": "Every source must set which tags have to be present in order to load the given layer."
             },
-            {
-              "type": "object",
-              "properties": {
-                "overpassScript": {
-                  "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible:\n```\n\"source\": {\n  \"overpassScript\":\n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
-                  "type": "string"
-                }
-              }
+            "maxCacheAge": {
+              "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
+              "type": "number"
             }
+          },
+          "required": [
+            "osmTags"
           ]
         },
         {
-          "allOf": [
-            {
-              "type": "object",
-              "properties": {
-                "osmTags": {
-                  "$ref": "#/definitions/TagConfigJson",
-                  "description": "Every source must set which tags have to be present in order to load the given layer."
-                },
-                "maxCacheAge": {
-                  "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
-                  "type": "number"
-                }
-              },
-              "required": [
-                "osmTags"
-              ]
+          "type": "object",
+          "properties": {
+            "geoJson": {
+              "description": "The actual source of the data to load, if loaded via geojson.\n\n# A single geojson-file\nsource: {geoJson: \"https://my.source.net/some-geo-data.geojson\"}\n fetches a geojson from a third party source\n\n# A tiled geojson source\nsource: {geoJson: \"https://my.source.net/some-tile-geojson-{layer}-{z}-{x}-{y}.geojson\", geoJsonZoomLevel: 14}\n to use a tiled geojson source. The web server must offer multiple geojsons. {z}, {x} and {y} are substituted by the location; {layer} is substituted with the id of the loaded layer\n\nSome API's use a BBOX instead of a tile, this can be used by specifying {y_min}, {y_max}, {x_min} and {x_max}",
+              "type": "string"
             },
-            {
-              "type": "object",
-              "properties": {
-                "geoJson": {
-                  "description": "The actual source of the data to load, if loaded via geojson.\n\n# A single geojson-file\nsource: {geoJson: \"https://my.source.net/some-geo-data.geojson\"}\n fetches a geojson from a third party source\n\n# A tiled geojson source\nsource: {geoJson: \"https://my.source.net/some-tile-geojson-{layer}-{z}-{x}-{y}.geojson\", geoJsonZoomLevel: 14}\n to use a tiled geojson source. The web server must offer multiple geojsons. {z}, {x} and {y} are substituted by the location; {layer} is substituted with the id of the loaded layer\n\nSome API's use a BBOX instead of a tile, this can be used by specifying {y_min}, {y_max}, {x_min} and {x_max}",
-                  "type": "string"
-                },
-                "geoJsonZoomLevel": {
-                  "description": "To load a tiled geojson layer, set the zoomlevel of the tiles",
-                  "type": "number"
-                },
-                "isOsmCache": {
-                  "description": "Indicates that the upstream geojson data is OSM-derived.\nUseful for e.g. merging or for scripts generating this cache",
-                  "type": "boolean"
-                },
-                "mercatorCrs": {
-                  "description": "Some API's use a mercator-projection (EPSG:900913) instead of WGS84. Set the flag `mercatorCrs: true`  in the source for this",
-                  "type": "boolean"
-                },
-                "idKey": {
-                  "description": "Some API's have an id-field, but give it a different name.\nSetting this key will rename this field into 'id'",
-                  "type": "string"
-                }
-              },
-              "required": [
-                "geoJson"
-              ]
+            "geoJsonZoomLevel": {
+              "description": "To load a tiled geojson layer, set the zoomlevel of the tiles",
+              "type": "number"
+            },
+            "isOsmCache": {
+              "description": "Indicates that the upstream geojson data is OSM-derived.\nUseful for e.g. merging or for scripts generating this cache",
+              "type": "boolean"
+            },
+            "mercatorCrs": {
+              "description": "Some API's use a mercator-projection (EPSG:900913) instead of WGS84. Set the flag `mercatorCrs: true`  in the source for this",
+              "type": "boolean"
+            },
+            "idKey": {
+              "description": "Some API's have an id-field, but give it a different name.\nSetting this key will rename this field into 'id'",
+              "type": "string"
             }
+          },
+          "required": [
+            "geoJson"
           ]
+        },
+        {
+          "enum": [
+            "special",
+            "special:library"
+          ],
+          "type": "string"
         }
       ]
     },
@@ -214,7 +204,15 @@ export default {
         "type": "object",
         "properties": {
           "title": {
-            "description": "The title - shown on the 'add-new'-button.\n\nThis should include the article of the noun, e.g. 'a hydrant', 'a bicycle pump'.\nThis text will be inserted into `Add {category} here`, becoming `Add a hydrant here`.\n\nDo _not_ indicate 'new': 'add a new shop here' is incorrect, as the shop might have existed forever, it could just be unmapped!"
+            "description": "The title - shown on the 'add-new'-button.\n\nThis should include the article of the noun, e.g. 'a hydrant', 'a bicycle pump'.\nThis text will be inserted into `Add {category} here`, becoming `Add a hydrant here`.\n\nDo _not_ indicate 'new': 'add a new shop here' is incorrect, as the shop might have existed forever, it could just be unmapped!",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/Record<string,string>"
+              },
+              {
+                "type": "string"
+              }
+            ]
           },
           "tags": {
             "description": "The tags to add. It determines the icon too",
@@ -224,7 +222,15 @@ export default {
             }
           },
           "description": {
-            "description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)"
+            "description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/Record<string,string>"
+              },
+              {
+                "type": "string"
+              }
+            ]
           },
           "exampleImages": {
             "description": "Example images, which show real-life pictures of what such a feature might look like\n\nType: image",
@@ -299,6 +305,9 @@ export default {
           {
             "type": "object",
             "properties": {
+              "id": {
+                "type": "string"
+              },
               "builtin": {
                 "anyOf": [
                   {
@@ -321,28 +330,6 @@ export default {
               "override"
             ]
           },
-          {
-            "type": "object",
-            "properties": {
-              "id": {
-                "type": "string"
-              },
-              "builtin": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              },
-              "override": {
-                "$ref": "#/definitions/Partial<QuestionableTagRenderingConfigJson>"
-              }
-            },
-            "required": [
-              "builtin",
-              "id",
-              "override"
-            ]
-          },
           {
             "allOf": [
               {
@@ -505,6 +492,12 @@ export default {
         "or"
       ]
     },
+    "Record<string,string>": {
+      "type": "object"
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object"
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -568,9 +561,6 @@ export default {
         "canonicalDenomination"
       ]
     },
-    "Record<string,string>": {
-      "type": "object"
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -579,10 +569,6 @@ export default {
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -590,11 +576,67 @@ export default {
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -612,6 +654,22 @@ export default {
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -636,7 +694,15 @@ export default {
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
@@ -788,7 +854,7 @@ export default {
       "type": "object",
       "properties": {
         "location": {
-          "description": "All the locations that this point should be rendered at.\nUsing `location: [\"point\", \"centroid\"] will always render centerpoint.\n'projected_centerpoint' will show an item on the line itself, near the middle of the line. (LineStrings only)",
+          "description": "All the locations that this point should be rendered at.\nPossible values are:\n- `point`: only renders points at their location\n- `centroid`: show a symbol at the centerpoint of a (multi)Linestring and (multi)polygon. Points will _not_ be rendered with this\n- `projected_centerpoint`: Only on (multi)linestrings: calculate the centerpoint and snap it to the way\n- `start` and `end`: only on linestrings: add a point to the first/last coordinate of the LineString",
           "type": "array",
           "items": {
             "type": "string"
@@ -867,7 +933,7 @@ export default {
           ]
         },
         "css": {
-          "description": "A snippet of css code",
+          "description": "A snippet of css code which is applied onto the container of the entire marker",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -878,7 +944,7 @@ export default {
           ]
         },
         "cssClasses": {
-          "description": "A snippet of css-classes. They can be space-separated",
+          "description": "A snippet of css-classes which are applied onto the container of the entire marker. They can be space-separated",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -887,6 +953,58 @@ export default {
               "type": "string"
             }
           ]
+        },
+        "labelCss": {
+          "description": "Css that is applied onto the label",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "labelCssClasses": {
+          "description": "Css classes that are applied onto the label; can be space-separated",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "pitchAlignment": {
+          "description": "If the map is pitched, the marker will stay parallel to the screen.\nSet to 'map' if you want to put it flattened on the map",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "enum": [
+                "canvas",
+                "map"
+              ],
+              "type": "string"
+            }
+          ]
+        },
+        "rotationAlignment": {
+          "description": "If the map is rotated, the icon will still point to the north if no rotation was applied",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "enum": [
+                "canvas",
+                "map"
+              ],
+              "type": "string"
+            }
+          ]
         }
       },
       "required": [
@@ -1090,7 +1208,7 @@ export default {
               }
             },
             "inline": {
-              "description": "When set, influences the way a question is asked.\nInstead of showing a full-widht text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.",
+              "description": "When set, influences the way a question is asked.\nInstead of showing a full-width text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.\nNote that this will be set automatically if no special elements are present.",
               "type": "boolean"
             },
             "default": {
@@ -1117,10 +1235,6 @@ export default {
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -1128,11 +1242,67 @@ export default {
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -1149,6 +1319,22 @@ export default {
               "type": "string"
             }
           ]
+        },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
         }
       }
     },
@@ -1204,7 +1390,7 @@ export default {
               }
             },
             "inline": {
-              "description": "When set, influences the way a question is asked.\nInstead of showing a full-widht text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.",
+              "description": "When set, influences the way a question is asked.\nInstead of showing a full-width text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.\nNote that this will be set automatically if no special elements are present.",
               "type": "boolean"
             },
             "default": {
@@ -1231,10 +1417,6 @@ export default {
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -1242,11 +1424,67 @@ export default {
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -1263,6 +1501,22 @@ export default {
               "type": "string"
             }
           ]
+        },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
         }
       }
     },
diff --git a/Docs/Schemas/LayoutConfigJson.schema.json b/Docs/Schemas/LayoutConfigJson.schema.json
index 76889c9419..c004dda312 100644
--- a/Docs/Schemas/LayoutConfigJson.schema.json
+++ b/Docs/Schemas/LayoutConfigJson.schema.json
@@ -18,16 +18,48 @@
       }
     },
     "title": {
-      "description": "The title, as shown in the welcome message and the more-screen."
+      "description": "The title, as shown in the welcome message and the more-screen.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "shortDescription": {
-      "description": "A short description, showed as social description and in the 'more theme'-buttons.\nNote that if this one is not defined, the first sentence of 'description' is used"
+      "description": "A short description, showed as social description and in the 'more theme'-buttons.\nNote that if this one is not defined, the first sentence of 'description' is used",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "description": {
-      "description": "The description, as shown in the welcome message and the more-screen"
+      "description": "The description, as shown in the welcome message and the more-screen",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "descriptionTail": {
-      "description": "A part of the description, shown under the login-button."
+      "description": "A part of the description, shown under the login-button.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "icon": {
       "description": "The icon representing this theme.\nUsed as logo in the more-screen and (for official themes) as favicon, webmanifest logo, ...\nEither a URL or a base64 encoded value (which should include 'data:image/svg+xml;base64)\n\nType: icon",
@@ -71,7 +103,19 @@
       "description": "Define some (overlay) slippy map tilesources",
       "type": "array",
       "items": {
-        "$ref": "#/definitions/default_6"
+        "allOf": [
+          {
+            "$ref": "#/definitions/RasterLayerProperties"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "defaultState": {
+                "type": "boolean"
+              }
+            }
+          }
+        ]
       }
     },
     "layers": {
@@ -98,7 +142,9 @@
                   }
                 ]
               },
-              "override": {},
+              "override": {
+                "$ref": "#/definitions/Partial<LayerConfigJson>"
+              },
               "hideTagRenderingsWithLabels": {
                 "description": "TagRenderings with any of these labels will be removed from the layer.\nNote that the 'id' and 'group' are considered labels too",
                 "type": "array",
@@ -118,30 +164,6 @@
         ]
       }
     },
-    "clustering": {
-      "description": "If defined, data will be clustered.\nDefaults to {maxZoom: 16, minNeeded: 500}",
-      "anyOf": [
-        {
-          "type": "object",
-          "properties": {
-            "maxZoom": {
-              "description": "All zoom levels above 'maxzoom' are not clustered anymore.\nDefaults to 18",
-              "type": "number"
-            },
-            "minNeededElements": {
-              "description": "The number of elements per tile needed to start clustering\nIf clustering is defined, defaults to 250",
-              "type": "number"
-            }
-          }
-        },
-        {
-          "enum": [
-            false
-          ],
-          "type": "boolean"
-        }
-      ]
-    },
     "customCss": {
       "description": "The URL of a custom CSS stylesheet to modify the layout",
       "type": "string"
@@ -266,6 +288,10 @@
     "overpassTimeout": {
       "description": "Set a different timeout for overpass queries - in seconds. Default: 30s",
       "type": "number"
+    },
+    "enableNodeDatabase": {
+      "description": "Enables tracking of all nodes when data is loaded.\nThis is useful for the 'ImportWay' and 'ConflateWay'-buttons who need this database.\n\nNote: this flag will be automatically set.",
+      "type": "boolean"
     }
   },
   "required": [
@@ -337,6 +363,14 @@
       ],
       "additionalProperties": false
     },
+    "Record<string,string>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object",
+      "additionalProperties": false
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -401,10 +435,6 @@
       ],
       "additionalProperties": false
     },
-    "Record<string,string>": {
-      "type": "object",
-      "additionalProperties": false
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -413,10 +443,6 @@
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -424,11 +450,67 @@
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -446,6 +528,22 @@
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -470,7 +568,15 @@
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
@@ -626,7 +732,7 @@
       "type": "object",
       "properties": {
         "location": {
-          "description": "All the locations that this point should be rendered at.\nUsing `location: [\"point\", \"centroid\"] will always render centerpoint.\n'projected_centerpoint' will show an item on the line itself, near the middle of the line. (LineStrings only)",
+          "description": "All the locations that this point should be rendered at.\nPossible values are:\n- `point`: only renders points at their location\n- `centroid`: show a symbol at the centerpoint of a (multi)Linestring and (multi)polygon. Points will _not_ be rendered with this\n- `projected_centerpoint`: Only on (multi)linestrings: calculate the centerpoint and snap it to the way\n- `start` and `end`: only on linestrings: add a point to the first/last coordinate of the LineString",
           "type": "array",
           "items": {
             "type": "string"
@@ -705,7 +811,7 @@
           ]
         },
         "css": {
-          "description": "A snippet of css code",
+          "description": "A snippet of css code which is applied onto the container of the entire marker",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -716,7 +822,7 @@
           ]
         },
         "cssClasses": {
-          "description": "A snippet of css-classes. They can be space-separated",
+          "description": "A snippet of css-classes which are applied onto the container of the entire marker. They can be space-separated",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -725,6 +831,58 @@
               "type": "string"
             }
           ]
+        },
+        "labelCss": {
+          "description": "Css that is applied onto the label",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "labelCssClasses": {
+          "description": "Css classes that are applied onto the label; can be space-separated",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "pitchAlignment": {
+          "description": "If the map is pitched, the marker will stay parallel to the screen.\nSet to 'map' if you want to put it flattened on the map",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "enum": [
+                "canvas",
+                "map"
+              ],
+              "type": "string"
+            }
+          ]
+        },
+        "rotationAlignment": {
+          "description": "If the map is rotated, the icon will still point to the north if no rotation was applied",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "enum": [
+                "canvas",
+                "map"
+              ],
+              "type": "string"
+            }
+          ]
         }
       },
       "required": [
@@ -931,7 +1089,7 @@
               }
             },
             "inline": {
-              "description": "When set, influences the way a question is asked.\nInstead of showing a full-widht text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.",
+              "description": "When set, influences the way a question is asked.\nInstead of showing a full-width text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.\nNote that this will be set automatically if no special elements are present.",
               "type": "boolean"
             },
             "default": {
@@ -958,10 +1116,6 @@
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -969,11 +1123,67 @@
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -990,6 +1200,22 @@
               "type": "string"
             }
           ]
+        },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
         }
       },
       "additionalProperties": false
@@ -1046,7 +1272,7 @@
               }
             },
             "inline": {
-              "description": "When set, influences the way a question is asked.\nInstead of showing a full-widht text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.",
+              "description": "When set, influences the way a question is asked.\nInstead of showing a full-width text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.\nNote that this will be set automatically if no special elements are present.",
               "type": "boolean"
             },
             "default": {
@@ -1073,10 +1299,6 @@
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -1084,11 +1306,67 @@
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -1105,6 +1383,22 @@
               "type": "string"
             }
           ]
+        },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
         }
       },
       "additionalProperties": false
@@ -1359,42 +1653,63 @@
       "type": "object",
       "additionalProperties": false
     },
-    "default_6": {
-      "description": "Configuration for a tilesource config",
+    "RasterLayerProperties": {
       "type": "object",
       "properties": {
-        "id": {
-          "description": "Id of this overlay, used in the URL-parameters to set the state",
-          "type": "string"
-        },
-        "source": {
-          "description": "The path, where {x}, {y} and {z} will be substituted",
-          "type": "string"
+        "name": {
+          "description": "The name of the imagery source",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "isOverlay": {
-          "description": "Wether or not this is an overlay. Default: true",
           "type": "boolean"
         },
-        "name": {
-          "description": "How this will be shown in the selection menu.\nMake undefined if this may not be toggled"
+        "id": {
+          "type": "string"
         },
-        "minZoom": {
-          "description": "Only visible at this or a higher zoom level",
+        "url": {
+          "type": "string"
+        },
+        "category": {
+          "type": "string"
+        },
+        "attribution": {
+          "type": "object",
+          "properties": {
+            "url": {
+              "type": "string"
+            },
+            "text": {
+              "type": "string"
+            },
+            "html": {
+              "type": "string"
+            },
+            "required": {
+              "type": "boolean"
+            }
+          }
+        },
+        "min_zoom": {
           "type": "number"
         },
-        "maxZoom": {
-          "description": "Only visible at this or a lower zoom level",
+        "max_zoom": {
           "type": "number"
         },
-        "defaultState": {
-          "description": "The default state, set to false to hide by default",
+        "best": {
           "type": "boolean"
         }
       },
       "required": [
-        "defaultState",
         "id",
-        "source"
+        "name",
+        "url"
       ],
       "additionalProperties": false
     },
@@ -1407,90 +1722,80 @@
           "type": "string"
         },
         "name": {
-          "description": "The name of this layer\nUsed in the layer control panel and the 'Personal theme'.\n\nIf not given, will be hidden (and thus not toggable) in the layer control"
-        },
-        "description": {
-          "description": "A description for this layer.\nShown in the layer selections and in the personel theme"
-        },
-        "source": {
-          "description": "This determines where the data for the layer is fetched: from OSM or from an external geojson dataset.\n\nIf no 'geojson' is defined, data will be fetched from overpass and the OSM-API.\n\nEvery source _must_ define which tags _must_ be present in order to be picked up.",
+          "description": "The name of this layer\nUsed in the layer control panel and the 'Personal theme'.\n\nIf not given, will be hidden (and thus not toggable) in the layer control",
           "anyOf": [
             {
-              "allOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "osmTags": {
-                      "$ref": "#/definitions/TagConfigJson",
-                      "description": "Every source must set which tags have to be present in order to load the given layer."
-                    },
-                    "maxCacheAge": {
-                      "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "osmTags"
-                  ]
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "description": {
+          "description": "A description for this layer.\nShown in the layer selections and in the personel theme",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "source": {
+          "description": "This determines where the data for the layer is fetched: from OSM or from an external geojson dataset.\n\nIf no 'geojson' is defined, data will be fetched from overpass and the OSM-API.\n\nEvery source _must_ define which tags _must_ be present in order to be picked up.\n\nNote: a source must always be defined. 'special' is only allowed if this is a builtin-layer",
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "osmTags": {
+                  "$ref": "#/definitions/TagConfigJson",
+                  "description": "Every source must set which tags have to be present in order to load the given layer."
                 },
-                {
-                  "type": "object",
-                  "properties": {
-                    "overpassScript": {
-                      "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible:\n```\n\"source\": {\n  \"overpassScript\":\n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
-                      "type": "string"
-                    }
-                  }
+                "maxCacheAge": {
+                  "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
+                  "type": "number"
                 }
+              },
+              "required": [
+                "osmTags"
               ]
             },
             {
-              "allOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "osmTags": {
-                      "$ref": "#/definitions/TagConfigJson",
-                      "description": "Every source must set which tags have to be present in order to load the given layer."
-                    },
-                    "maxCacheAge": {
-                      "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "osmTags"
-                  ]
+              "type": "object",
+              "properties": {
+                "geoJson": {
+                  "description": "The actual source of the data to load, if loaded via geojson.\n\n# A single geojson-file\nsource: {geoJson: \"https://my.source.net/some-geo-data.geojson\"}\n fetches a geojson from a third party source\n\n# A tiled geojson source\nsource: {geoJson: \"https://my.source.net/some-tile-geojson-{layer}-{z}-{x}-{y}.geojson\", geoJsonZoomLevel: 14}\n to use a tiled geojson source. The web server must offer multiple geojsons. {z}, {x} and {y} are substituted by the location; {layer} is substituted with the id of the loaded layer\n\nSome API's use a BBOX instead of a tile, this can be used by specifying {y_min}, {y_max}, {x_min} and {x_max}",
+                  "type": "string"
                 },
-                {
-                  "type": "object",
-                  "properties": {
-                    "geoJson": {
-                      "description": "The actual source of the data to load, if loaded via geojson.\n\n# A single geojson-file\nsource: {geoJson: \"https://my.source.net/some-geo-data.geojson\"}\n fetches a geojson from a third party source\n\n# A tiled geojson source\nsource: {geoJson: \"https://my.source.net/some-tile-geojson-{layer}-{z}-{x}-{y}.geojson\", geoJsonZoomLevel: 14}\n to use a tiled geojson source. The web server must offer multiple geojsons. {z}, {x} and {y} are substituted by the location; {layer} is substituted with the id of the loaded layer\n\nSome API's use a BBOX instead of a tile, this can be used by specifying {y_min}, {y_max}, {x_min} and {x_max}",
-                      "type": "string"
-                    },
-                    "geoJsonZoomLevel": {
-                      "description": "To load a tiled geojson layer, set the zoomlevel of the tiles",
-                      "type": "number"
-                    },
-                    "isOsmCache": {
-                      "description": "Indicates that the upstream geojson data is OSM-derived.\nUseful for e.g. merging or for scripts generating this cache",
-                      "type": "boolean"
-                    },
-                    "mercatorCrs": {
-                      "description": "Some API's use a mercator-projection (EPSG:900913) instead of WGS84. Set the flag `mercatorCrs: true`  in the source for this",
-                      "type": "boolean"
-                    },
-                    "idKey": {
-                      "description": "Some API's have an id-field, but give it a different name.\nSetting this key will rename this field into 'id'",
-                      "type": "string"
-                    }
-                  },
-                  "required": [
-                    "geoJson"
-                  ]
+                "geoJsonZoomLevel": {
+                  "description": "To load a tiled geojson layer, set the zoomlevel of the tiles",
+                  "type": "number"
+                },
+                "isOsmCache": {
+                  "description": "Indicates that the upstream geojson data is OSM-derived.\nUseful for e.g. merging or for scripts generating this cache",
+                  "type": "boolean"
+                },
+                "mercatorCrs": {
+                  "description": "Some API's use a mercator-projection (EPSG:900913) instead of WGS84. Set the flag `mercatorCrs: true`  in the source for this",
+                  "type": "boolean"
+                },
+                "idKey": {
+                  "description": "Some API's have an id-field, but give it a different name.\nSetting this key will rename this field into 'id'",
+                  "type": "string"
                 }
+              },
+              "required": [
+                "geoJson"
               ]
+            },
+            {
+              "enum": [
+                "special",
+                "special:library"
+              ],
+              "type": "string"
             }
           ]
         },
@@ -1614,7 +1919,15 @@
             "type": "object",
             "properties": {
               "title": {
-                "description": "The title - shown on the 'add-new'-button.\n\nThis should include the article of the noun, e.g. 'a hydrant', 'a bicycle pump'.\nThis text will be inserted into `Add {category} here`, becoming `Add a hydrant here`.\n\nDo _not_ indicate 'new': 'add a new shop here' is incorrect, as the shop might have existed forever, it could just be unmapped!"
+                "description": "The title - shown on the 'add-new'-button.\n\nThis should include the article of the noun, e.g. 'a hydrant', 'a bicycle pump'.\nThis text will be inserted into `Add {category} here`, becoming `Add a hydrant here`.\n\nDo _not_ indicate 'new': 'add a new shop here' is incorrect, as the shop might have existed forever, it could just be unmapped!",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "tags": {
                 "description": "The tags to add. It determines the icon too",
@@ -1624,7 +1937,15 @@
                 }
               },
               "description": {
-                "description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)"
+                "description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "exampleImages": {
                 "description": "Example images, which show real-life pictures of what such a feature might look like\n\nType: image",
@@ -1699,6 +2020,9 @@
               {
                 "type": "object",
                 "properties": {
+                  "id": {
+                    "type": "string"
+                  },
                   "builtin": {
                     "anyOf": [
                       {
@@ -1721,28 +2045,6 @@
                   "override"
                 ]
               },
-              {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "type": "string"
-                  },
-                  "builtin": {
-                    "type": "array",
-                    "items": {
-                      "type": "string"
-                    }
-                  },
-                  "override": {
-                    "$ref": "#/definitions/Partial<QuestionableTagRenderingConfigJson>"
-                  }
-                },
-                "required": [
-                  "builtin",
-                  "id",
-                  "override"
-                ]
-              },
               {
                 "allOf": [
                   {
@@ -1850,6 +2152,439 @@
       ],
       "additionalProperties": false
     },
+    "Partial<LayerConfigJson>": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "description": "The id of this layer.\nThis should be a simple, lowercase, human readable string that is used to identify the layer.",
+          "type": "string"
+        },
+        "name": {
+          "description": "The name of this layer\nUsed in the layer control panel and the 'Personal theme'.\n\nIf not given, will be hidden (and thus not toggable) in the layer control",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "description": {
+          "description": "A description for this layer.\nShown in the layer selections and in the personel theme",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "source": {
+          "description": "This determines where the data for the layer is fetched: from OSM or from an external geojson dataset.\n\nIf no 'geojson' is defined, data will be fetched from overpass and the OSM-API.\n\nEvery source _must_ define which tags _must_ be present in order to be picked up.\n\nNote: a source must always be defined. 'special' is only allowed if this is a builtin-layer",
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "osmTags": {
+                  "$ref": "#/definitions/TagConfigJson",
+                  "description": "Every source must set which tags have to be present in order to load the given layer."
+                },
+                "maxCacheAge": {
+                  "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
+                  "type": "number"
+                }
+              },
+              "required": [
+                "osmTags"
+              ]
+            },
+            {
+              "type": "object",
+              "properties": {
+                "geoJson": {
+                  "description": "The actual source of the data to load, if loaded via geojson.\n\n# A single geojson-file\nsource: {geoJson: \"https://my.source.net/some-geo-data.geojson\"}\n fetches a geojson from a third party source\n\n# A tiled geojson source\nsource: {geoJson: \"https://my.source.net/some-tile-geojson-{layer}-{z}-{x}-{y}.geojson\", geoJsonZoomLevel: 14}\n to use a tiled geojson source. The web server must offer multiple geojsons. {z}, {x} and {y} are substituted by the location; {layer} is substituted with the id of the loaded layer\n\nSome API's use a BBOX instead of a tile, this can be used by specifying {y_min}, {y_max}, {x_min} and {x_max}",
+                  "type": "string"
+                },
+                "geoJsonZoomLevel": {
+                  "description": "To load a tiled geojson layer, set the zoomlevel of the tiles",
+                  "type": "number"
+                },
+                "isOsmCache": {
+                  "description": "Indicates that the upstream geojson data is OSM-derived.\nUseful for e.g. merging or for scripts generating this cache",
+                  "type": "boolean"
+                },
+                "mercatorCrs": {
+                  "description": "Some API's use a mercator-projection (EPSG:900913) instead of WGS84. Set the flag `mercatorCrs: true`  in the source for this",
+                  "type": "boolean"
+                },
+                "idKey": {
+                  "description": "Some API's have an id-field, but give it a different name.\nSetting this key will rename this field into 'id'",
+                  "type": "string"
+                }
+              },
+              "required": [
+                "geoJson"
+              ]
+            },
+            {
+              "enum": [
+                "special",
+                "special:library"
+              ],
+              "type": "string"
+            }
+          ]
+        },
+        "calculatedTags": {
+          "description": "A list of extra tags to calculate, specified as \"keyToAssignTo=javascript-expression\".\nThere are a few extra functions available. Refer to <a>Docs/CalculatedTags.md</a> for more information\nThe functions will be run in order, e.g.\n[\n \"_max_overlap_m2=Math.max(...feat.overlapsWith(\"someOtherLayer\").map(o => o.overlap))\n \"_max_overlap_ratio=Number(feat._max_overlap_m2)/feat.area\n]\n\nThe specified tags are evaluated lazily. E.g. if a calculated tag is only used in the popup (e.g. the number of nearby features),\nthe expensive calculation will only be performed then for that feature. This avoids clogging up the contributors PC when all features are loaded.\n\nIf a tag has to be evaluated strictly, use ':=' instead:\n\n[\n\"_some_key:=some_javascript_expression\"\n]",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "doNotDownload": {
+          "description": "If set, this layer will not query overpass; but it'll still match the tags above which are by chance returned by other layers.\nWorks well together with 'passAllFeatures', to add decoration",
+          "type": "boolean"
+        },
+        "isShown": {
+          "description": "If set, only features matching this extra tag will be shown.\nThis is useful to hide certain features from view.\n\nImportant: hiding features does not work dynamically, but is only calculated when the data is first renders.\nThis implies that it is not possible to hide a feature after a tagging change\n\nThe default value is 'yes'",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "forceLoad": {
+          "description": "Advanced option - might be set by the theme compiler\n\nIf true, this data will _always_ be loaded, even if the theme is disabled",
+          "type": "boolean"
+        },
+        "minzoom": {
+          "description": "The minimum needed zoomlevel required before loading of the data start\nDefault: 0",
+          "type": "number"
+        },
+        "shownByDefault": {
+          "description": "Indicates if this layer is shown by default;\ncan be used to hide a layer from start, or to load the layer but only to show it where appropriate (e.g. for snapping to it)",
+          "type": "boolean"
+        },
+        "minzoomVisible": {
+          "description": "The zoom level at which point the data is hidden again\nDefault: 100 (thus: always visible",
+          "type": "number"
+        },
+        "title": {
+          "description": "The title shown in a popup for elements of this layer.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "titleIcons": {
+          "description": "Small icons shown next to the title.\nIf not specified, the OsmLink and wikipedia links will be used by default.\nUse an empty array to hide them.\nNote that \"defaults\" will insert all the default titleIcons (which are added automatically)\n\nType: icon[]",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/TagRenderingConfigJson"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              }
+            },
+            {
+              "type": "array",
+              "items": [
+                {
+                  "type": "string",
+                  "enum": [
+                    "defaults"
+                  ]
+                }
+              ],
+              "minItems": 1,
+              "maxItems": 1
+            }
+          ]
+        },
+        "mapRendering": {
+          "description": "Visualisation of the items on the map",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/default_4"
+                  },
+                  {
+                    "$ref": "#/definitions/default_5"
+                  },
+                  {
+                    "$ref": "#/definitions/default<default|default|default[]|default[]>"
+                  }
+                ]
+              }
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "passAllFeatures": {
+          "description": "If set, this layer will pass all the features it receives onto the next layer.\nThis is ideal for decoration, e.g. directionss on cameras",
+          "type": "boolean"
+        },
+        "presets": {
+          "description": "Presets for this layer.\nA preset shows up when clicking the map on a without data (or when right-clicking/long-pressing);\nit will prompt the user to add a new point.\n\nThe most important aspect are the tags, which define which tags the new point will have;\nThe title is shown in the dialog, along with the first sentence of the description.\n\nUpon confirmation, the full description is shown beneath the buttons - perfect to add pictures and examples.\n\nNote: the icon of the preset is determined automatically based on the tags and the icon above. Don't worry about that!\nNB: if no presets are defined, the popup to add new points doesn't show up at all",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "title": {
+                "description": "The title - shown on the 'add-new'-button.\n\nThis should include the article of the noun, e.g. 'a hydrant', 'a bicycle pump'.\nThis text will be inserted into `Add {category} here`, becoming `Add a hydrant here`.\n\nDo _not_ indicate 'new': 'add a new shop here' is incorrect, as the shop might have existed forever, it could just be unmapped!",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "tags": {
+                "description": "The tags to add. It determines the icon too",
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "description": {
+                "description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "exampleImages": {
+                "description": "Example images, which show real-life pictures of what such a feature might look like\n\nType: image",
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "preciseInput": {
+                "description": "If set, the user will prompted to confirm the location before actually adding the data.\nThis will be with a 'drag crosshair'-method.\n\nIf 'preferredBackgroundCategory' is set, the element will attempt to pick a background layer of that category.",
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "properties": {
+                      "preferredBackground": {
+                        "description": "The type of background picture",
+                        "anyOf": [
+                          {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          {
+                            "type": "string"
+                          }
+                        ]
+                      },
+                      "snapToLayer": {
+                        "description": "If specified, these layers will be shown to and the new point will be snapped towards it",
+                        "anyOf": [
+                          {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          {
+                            "type": "string"
+                          }
+                        ]
+                      },
+                      "maxSnapDistance": {
+                        "description": "If specified, a new point will only be snapped if it is within this range.\nDistance in meter\n\nDefault: 10",
+                        "type": "number"
+                      }
+                    }
+                  },
+                  {
+                    "enum": [
+                      true
+                    ],
+                    "type": "boolean"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "tags",
+              "title"
+            ]
+          }
+        },
+        "tagRenderings": {
+          "description": "All the tag renderings.\nA tag rendering is a block that either shows the known value or asks a question.\n\nRefer to the class `TagRenderingConfigJson` to see the possibilities.\n\nNote that we can also use a string here - where the string refers to a tag rendering defined in `assets/questions/questions.json`,\nwhere a few very general questions are defined e.g. website, phone number, ...\nFurthermore, _all_ the questions of another layer can be reused with `otherlayer.*`\nIf you need only a single of the tagRenderings, use `otherlayer.tagrenderingId`\nIf one or more questions have a 'group' or 'label' set, select all the entries with the corresponding group or label with `otherlayer.*group`\nRemark: if a tagRendering is 'lent' from another layer, the 'source'-tags are copied and added as condition.\nIf they are not wanted, remove them with an override\n\nA special value is 'questions', which indicates the location of the questions box. If not specified, it'll be appended to the bottom of the featureInfobox.\n\nAt last, one can define a group of renderings where parts of all strings will be replaced by multiple other strings.\nThis is mainly create questions for a 'left' and a 'right' side of the road.\nThese will be grouped and questions will be asked together",
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/QuestionableTagRenderingConfigJson"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "builtin": {
+                    "anyOf": [
+                      {
+                        "type": "array",
+                        "items": {
+                          "type": "string"
+                        }
+                      },
+                      {
+                        "type": "string"
+                      }
+                    ]
+                  },
+                  "override": {
+                    "$ref": "#/definitions/Partial<QuestionableTagRenderingConfigJson>"
+                  }
+                },
+                "required": [
+                  "builtin",
+                  "override"
+                ]
+              },
+              {
+                "allOf": [
+                  {
+                    "$ref": "#/definitions/default<(string|QuestionableTagRenderingConfigJson|{builtin:string;override:Partial<QuestionableTagRenderingConfigJson>;})[]>"
+                  },
+                  {
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "id"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string"
+              }
+            ]
+          }
+        },
+        "filter": {
+          "description": "All the extra questions for filtering.\nIf a string is given, mapComplete will search in 'filters.json' for the appropriate filter or will try to parse it as `layername.filterid` and us that one",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/default_1"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              }
+            },
+            {
+              "type": "object",
+              "properties": {
+                "sameAs": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "sameAs"
+              ]
+            }
+          ]
+        },
+        "deletion": {
+          "description": "This block defines under what circumstances the delete dialog is shown for objects of this layer.\nIf set, a dialog is shown to the user to (soft) delete the point.\nThe dialog is built to be user friendly and to prevent mistakes.\nIf deletion is not possible, the dialog will hide itself and show the reason of non-deletability instead.\n\nTo configure, the following values are possible:\n\n- false: never ever show the delete button\n- true: show the default delete button\n- undefined: use the mapcomplete default to show deletion or not. Currently, this is the same as 'false' but this will change in the future\n- or: a hash with options (see below)\n\n The delete dialog\n =================\n\n\n\n#### Hard deletion if enough experience\n\nA feature can only be deleted from OpenStreetMap by mapcomplete if:\n\n- It is a node\n- No ways or relations use the node\n- The logged-in user has enough experience OR the user is the only one to have edited the point previously\n- The logged-in user has no unread messages (or has a ton of experience)\n- The user did not select one of the 'non-delete-options' (see below)\n\nIn all other cases, a 'soft deletion' is used.\n\n#### Soft deletion\n\nA 'soft deletion' is when the point isn't deleted from OSM but retagged so that it'll won't how up in the mapcomplete theme anymore.\nThis makes it look like it was deleted, without doing damage. A fixme will be added to the point.\n\nNote that a soft deletion is _only_ possible if these tags are provided by the theme creator, as they'll be different for every theme\n\n#### No-delete options\n\nIn some cases, the contributor might want to delete something for the wrong reason (e.g. someone who wants to have a path removed \"because the path is on their private property\").\nHowever, the path exists in reality and should thus be on OSM - otherwise the next contributor will pass by and notice \"hey, there is a path missing here! Let me redraw it in OSM!)\n\nThe correct approach is to retag the feature in such a way that it is semantically correct *and* that it doesn't show up on the theme anymore.\nA no-delete option is offered as 'reason to delete it', but secretly retags.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/DeleteConfigJson"
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
+        "allowMove": {
+          "description": "Indicates if a point can be moved and configures the modalities.\n\nA feature can be moved by MapComplete if:\n\n- It is a point\n- The point is _not_ part of a way or a a relation.\n\nOff by default. Can be enabled by setting this flag or by configuring.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/default_3"
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
+        "allowSplit": {
+          "description": "If set, a 'split this way' button is shown on objects rendered as LineStrings, e.g. highways.\n\nIf the way is part of a relation, MapComplete will attempt to update this relation as well",
+          "type": "boolean"
+        },
+        "units": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/default_2"
+          }
+        },
+        "syncSelection": {
+          "description": "If set, synchronizes whether or not this layer is enabled.\n\nno: Do not sync at all, always revert to default\nlocal: keep selection on local storage\ntheme-only: sync via OSM, but this layer will only be toggled in this theme\nglobal: all layers with this ID will be synced accross all themes",
+          "enum": [
+            "global",
+            "local",
+            "no",
+            "theme-only"
+          ],
+          "type": "string"
+        },
+        "#": {
+          "description": "Used for comments and/or to disable some checks\n\nno-question-hint-check: disables a check in MiscTagRenderingChecks which complains about 'div', 'span' or 'class=subtle'-HTML elements in the tagRendering",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
     "default": {
       "type": "object",
       "properties": {
diff --git a/Docs/Schemas/LayoutConfigJsonJSC.ts b/Docs/Schemas/LayoutConfigJsonJSC.ts
index 2172da51d9..7c396ce1e4 100644
--- a/Docs/Schemas/LayoutConfigJsonJSC.ts
+++ b/Docs/Schemas/LayoutConfigJsonJSC.ts
@@ -18,16 +18,48 @@ export default {
       }
     },
     "title": {
-      "description": "The title, as shown in the welcome message and the more-screen."
+      "description": "The title, as shown in the welcome message and the more-screen.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "shortDescription": {
-      "description": "A short description, showed as social description and in the 'more theme'-buttons.\nNote that if this one is not defined, the first sentence of 'description' is used"
+      "description": "A short description, showed as social description and in the 'more theme'-buttons.\nNote that if this one is not defined, the first sentence of 'description' is used",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "description": {
-      "description": "The description, as shown in the welcome message and the more-screen"
+      "description": "The description, as shown in the welcome message and the more-screen",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "descriptionTail": {
-      "description": "A part of the description, shown under the login-button."
+      "description": "A part of the description, shown under the login-button.",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "icon": {
       "description": "The icon representing this theme.\nUsed as logo in the more-screen and (for official themes) as favicon, webmanifest logo, ...\nEither a URL or a base64 encoded value (which should include 'data:image/svg+xml;base64)\n\nType: icon",
@@ -71,7 +103,19 @@ export default {
       "description": "Define some (overlay) slippy map tilesources",
       "type": "array",
       "items": {
-        "$ref": "#/definitions/default_6"
+        "allOf": [
+          {
+            "$ref": "#/definitions/RasterLayerProperties"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "defaultState": {
+                "type": "boolean"
+              }
+            }
+          }
+        ]
       }
     },
     "layers": {
@@ -98,7 +142,9 @@ export default {
                   }
                 ]
               },
-              "override": {},
+              "override": {
+                "$ref": "#/definitions/Partial<LayerConfigJson>"
+              },
               "hideTagRenderingsWithLabels": {
                 "description": "TagRenderings with any of these labels will be removed from the layer.\nNote that the 'id' and 'group' are considered labels too",
                 "type": "array",
@@ -118,30 +164,6 @@ export default {
         ]
       }
     },
-    "clustering": {
-      "description": "If defined, data will be clustered.\nDefaults to {maxZoom: 16, minNeeded: 500}",
-      "anyOf": [
-        {
-          "type": "object",
-          "properties": {
-            "maxZoom": {
-              "description": "All zoom levels above 'maxzoom' are not clustered anymore.\nDefaults to 18",
-              "type": "number"
-            },
-            "minNeededElements": {
-              "description": "The number of elements per tile needed to start clustering\nIf clustering is defined, defaults to 250",
-              "type": "number"
-            }
-          }
-        },
-        {
-          "enum": [
-            false
-          ],
-          "type": "boolean"
-        }
-      ]
-    },
     "customCss": {
       "description": "The URL of a custom CSS stylesheet to modify the layout",
       "type": "string"
@@ -266,6 +288,10 @@ export default {
     "overpassTimeout": {
       "description": "Set a different timeout for overpass queries - in seconds. Default: 30s",
       "type": "number"
+    },
+    "enableNodeDatabase": {
+      "description": "Enables tracking of all nodes when data is loaded.\nThis is useful for the 'ImportWay' and 'ConflateWay'-buttons who need this database.\n\nNote: this flag will be automatically set.",
+      "type": "boolean"
     }
   },
   "required": [
@@ -335,6 +361,12 @@ export default {
         "or"
       ]
     },
+    "Record<string,string>": {
+      "type": "object"
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object"
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -398,9 +430,6 @@ export default {
         "canonicalDenomination"
       ]
     },
-    "Record<string,string>": {
-      "type": "object"
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -409,10 +438,6 @@ export default {
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -420,11 +445,67 @@ export default {
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -442,6 +523,22 @@ export default {
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -466,7 +563,15 @@ export default {
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
@@ -618,7 +723,7 @@ export default {
       "type": "object",
       "properties": {
         "location": {
-          "description": "All the locations that this point should be rendered at.\nUsing `location: [\"point\", \"centroid\"] will always render centerpoint.\n'projected_centerpoint' will show an item on the line itself, near the middle of the line. (LineStrings only)",
+          "description": "All the locations that this point should be rendered at.\nPossible values are:\n- `point`: only renders points at their location\n- `centroid`: show a symbol at the centerpoint of a (multi)Linestring and (multi)polygon. Points will _not_ be rendered with this\n- `projected_centerpoint`: Only on (multi)linestrings: calculate the centerpoint and snap it to the way\n- `start` and `end`: only on linestrings: add a point to the first/last coordinate of the LineString",
           "type": "array",
           "items": {
             "type": "string"
@@ -697,7 +802,7 @@ export default {
           ]
         },
         "css": {
-          "description": "A snippet of css code",
+          "description": "A snippet of css code which is applied onto the container of the entire marker",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -708,7 +813,7 @@ export default {
           ]
         },
         "cssClasses": {
-          "description": "A snippet of css-classes. They can be space-separated",
+          "description": "A snippet of css-classes which are applied onto the container of the entire marker. They can be space-separated",
           "anyOf": [
             {
               "$ref": "#/definitions/TagRenderingConfigJson"
@@ -717,6 +822,58 @@ export default {
               "type": "string"
             }
           ]
+        },
+        "labelCss": {
+          "description": "Css that is applied onto the label",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "labelCssClasses": {
+          "description": "Css classes that are applied onto the label; can be space-separated",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "pitchAlignment": {
+          "description": "If the map is pitched, the marker will stay parallel to the screen.\nSet to 'map' if you want to put it flattened on the map",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "enum": [
+                "canvas",
+                "map"
+              ],
+              "type": "string"
+            }
+          ]
+        },
+        "rotationAlignment": {
+          "description": "If the map is rotated, the icon will still point to the north if no rotation was applied",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "enum": [
+                "canvas",
+                "map"
+              ],
+              "type": "string"
+            }
+          ]
         }
       },
       "required": [
@@ -920,7 +1077,7 @@ export default {
               }
             },
             "inline": {
-              "description": "When set, influences the way a question is asked.\nInstead of showing a full-widht text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.",
+              "description": "When set, influences the way a question is asked.\nInstead of showing a full-width text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.\nNote that this will be set automatically if no special elements are present.",
               "type": "boolean"
             },
             "default": {
@@ -947,10 +1104,6 @@ export default {
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -958,11 +1111,67 @@ export default {
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -979,6 +1188,22 @@ export default {
               "type": "string"
             }
           ]
+        },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
         }
       }
     },
@@ -1034,7 +1259,7 @@ export default {
               }
             },
             "inline": {
-              "description": "When set, influences the way a question is asked.\nInstead of showing a full-widht text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.",
+              "description": "When set, influences the way a question is asked.\nInstead of showing a full-width text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.\nNote that this will be set automatically if no special elements are present.",
               "type": "boolean"
             },
             "default": {
@@ -1061,10 +1286,6 @@ export default {
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -1072,11 +1293,67 @@ export default {
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -1093,6 +1370,22 @@ export default {
               "type": "string"
             }
           ]
+        },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
         }
       }
     },
@@ -1340,42 +1633,63 @@ export default {
     "Partial<any>": {
       "type": "object"
     },
-    "default_6": {
-      "description": "Configuration for a tilesource config",
+    "RasterLayerProperties": {
       "type": "object",
       "properties": {
-        "id": {
-          "description": "Id of this overlay, used in the URL-parameters to set the state",
-          "type": "string"
-        },
-        "source": {
-          "description": "The path, where {x}, {y} and {z} will be substituted",
-          "type": "string"
+        "name": {
+          "description": "The name of the imagery source",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "isOverlay": {
-          "description": "Wether or not this is an overlay. Default: true",
           "type": "boolean"
         },
-        "name": {
-          "description": "How this will be shown in the selection menu.\nMake undefined if this may not be toggled"
+        "id": {
+          "type": "string"
         },
-        "minZoom": {
-          "description": "Only visible at this or a higher zoom level",
+        "url": {
+          "type": "string"
+        },
+        "category": {
+          "type": "string"
+        },
+        "attribution": {
+          "type": "object",
+          "properties": {
+            "url": {
+              "type": "string"
+            },
+            "text": {
+              "type": "string"
+            },
+            "html": {
+              "type": "string"
+            },
+            "required": {
+              "type": "boolean"
+            }
+          }
+        },
+        "min_zoom": {
           "type": "number"
         },
-        "maxZoom": {
-          "description": "Only visible at this or a lower zoom level",
+        "max_zoom": {
           "type": "number"
         },
-        "defaultState": {
-          "description": "The default state, set to false to hide by default",
+        "best": {
           "type": "boolean"
         }
       },
       "required": [
-        "defaultState",
         "id",
-        "source"
+        "name",
+        "url"
       ]
     },
     "LayerConfigJson": {
@@ -1387,90 +1701,80 @@ export default {
           "type": "string"
         },
         "name": {
-          "description": "The name of this layer\nUsed in the layer control panel and the 'Personal theme'.\n\nIf not given, will be hidden (and thus not toggable) in the layer control"
-        },
-        "description": {
-          "description": "A description for this layer.\nShown in the layer selections and in the personel theme"
-        },
-        "source": {
-          "description": "This determines where the data for the layer is fetched: from OSM or from an external geojson dataset.\n\nIf no 'geojson' is defined, data will be fetched from overpass and the OSM-API.\n\nEvery source _must_ define which tags _must_ be present in order to be picked up.",
+          "description": "The name of this layer\nUsed in the layer control panel and the 'Personal theme'.\n\nIf not given, will be hidden (and thus not toggable) in the layer control",
           "anyOf": [
             {
-              "allOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "osmTags": {
-                      "$ref": "#/definitions/TagConfigJson",
-                      "description": "Every source must set which tags have to be present in order to load the given layer."
-                    },
-                    "maxCacheAge": {
-                      "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "osmTags"
-                  ]
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "description": {
+          "description": "A description for this layer.\nShown in the layer selections and in the personel theme",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "source": {
+          "description": "This determines where the data for the layer is fetched: from OSM or from an external geojson dataset.\n\nIf no 'geojson' is defined, data will be fetched from overpass and the OSM-API.\n\nEvery source _must_ define which tags _must_ be present in order to be picked up.\n\nNote: a source must always be defined. 'special' is only allowed if this is a builtin-layer",
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "osmTags": {
+                  "$ref": "#/definitions/TagConfigJson",
+                  "description": "Every source must set which tags have to be present in order to load the given layer."
                 },
-                {
-                  "type": "object",
-                  "properties": {
-                    "overpassScript": {
-                      "description": "If set, this custom overpass-script will be used instead of building one by using the OSM-tags.\nSpecifying OSM-tags is still obligatory and will still hide non-matching items and they will be used for the rest of the pipeline.\n_This should be really rare_.\n\nFor example, when you want to fetch all grass-areas in parks and which are marked as publicly accessible:\n```\n\"source\": {\n  \"overpassScript\":\n     \"way[\\\"leisure\\\"=\\\"park\\\"];node(w);is_in;area._[\\\"leisure\\\"=\\\"park\\\"];(way(area)[\\\"landuse\\\"=\\\"grass\\\"]; node(w); );\",\n     \"osmTags\": \"access=yes\"\n}\n```",
-                      "type": "string"
-                    }
-                  }
+                "maxCacheAge": {
+                  "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
+                  "type": "number"
                 }
+              },
+              "required": [
+                "osmTags"
               ]
             },
             {
-              "allOf": [
-                {
-                  "type": "object",
-                  "properties": {
-                    "osmTags": {
-                      "$ref": "#/definitions/TagConfigJson",
-                      "description": "Every source must set which tags have to be present in order to load the given layer."
-                    },
-                    "maxCacheAge": {
-                      "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "osmTags"
-                  ]
+              "type": "object",
+              "properties": {
+                "geoJson": {
+                  "description": "The actual source of the data to load, if loaded via geojson.\n\n# A single geojson-file\nsource: {geoJson: \"https://my.source.net/some-geo-data.geojson\"}\n fetches a geojson from a third party source\n\n# A tiled geojson source\nsource: {geoJson: \"https://my.source.net/some-tile-geojson-{layer}-{z}-{x}-{y}.geojson\", geoJsonZoomLevel: 14}\n to use a tiled geojson source. The web server must offer multiple geojsons. {z}, {x} and {y} are substituted by the location; {layer} is substituted with the id of the loaded layer\n\nSome API's use a BBOX instead of a tile, this can be used by specifying {y_min}, {y_max}, {x_min} and {x_max}",
+                  "type": "string"
                 },
-                {
-                  "type": "object",
-                  "properties": {
-                    "geoJson": {
-                      "description": "The actual source of the data to load, if loaded via geojson.\n\n# A single geojson-file\nsource: {geoJson: \"https://my.source.net/some-geo-data.geojson\"}\n fetches a geojson from a third party source\n\n# A tiled geojson source\nsource: {geoJson: \"https://my.source.net/some-tile-geojson-{layer}-{z}-{x}-{y}.geojson\", geoJsonZoomLevel: 14}\n to use a tiled geojson source. The web server must offer multiple geojsons. {z}, {x} and {y} are substituted by the location; {layer} is substituted with the id of the loaded layer\n\nSome API's use a BBOX instead of a tile, this can be used by specifying {y_min}, {y_max}, {x_min} and {x_max}",
-                      "type": "string"
-                    },
-                    "geoJsonZoomLevel": {
-                      "description": "To load a tiled geojson layer, set the zoomlevel of the tiles",
-                      "type": "number"
-                    },
-                    "isOsmCache": {
-                      "description": "Indicates that the upstream geojson data is OSM-derived.\nUseful for e.g. merging or for scripts generating this cache",
-                      "type": "boolean"
-                    },
-                    "mercatorCrs": {
-                      "description": "Some API's use a mercator-projection (EPSG:900913) instead of WGS84. Set the flag `mercatorCrs: true`  in the source for this",
-                      "type": "boolean"
-                    },
-                    "idKey": {
-                      "description": "Some API's have an id-field, but give it a different name.\nSetting this key will rename this field into 'id'",
-                      "type": "string"
-                    }
-                  },
-                  "required": [
-                    "geoJson"
-                  ]
+                "geoJsonZoomLevel": {
+                  "description": "To load a tiled geojson layer, set the zoomlevel of the tiles",
+                  "type": "number"
+                },
+                "isOsmCache": {
+                  "description": "Indicates that the upstream geojson data is OSM-derived.\nUseful for e.g. merging or for scripts generating this cache",
+                  "type": "boolean"
+                },
+                "mercatorCrs": {
+                  "description": "Some API's use a mercator-projection (EPSG:900913) instead of WGS84. Set the flag `mercatorCrs: true`  in the source for this",
+                  "type": "boolean"
+                },
+                "idKey": {
+                  "description": "Some API's have an id-field, but give it a different name.\nSetting this key will rename this field into 'id'",
+                  "type": "string"
                 }
+              },
+              "required": [
+                "geoJson"
               ]
+            },
+            {
+              "enum": [
+                "special",
+                "special:library"
+              ],
+              "type": "string"
             }
           ]
         },
@@ -1594,7 +1898,15 @@ export default {
             "type": "object",
             "properties": {
               "title": {
-                "description": "The title - shown on the 'add-new'-button.\n\nThis should include the article of the noun, e.g. 'a hydrant', 'a bicycle pump'.\nThis text will be inserted into `Add {category} here`, becoming `Add a hydrant here`.\n\nDo _not_ indicate 'new': 'add a new shop here' is incorrect, as the shop might have existed forever, it could just be unmapped!"
+                "description": "The title - shown on the 'add-new'-button.\n\nThis should include the article of the noun, e.g. 'a hydrant', 'a bicycle pump'.\nThis text will be inserted into `Add {category} here`, becoming `Add a hydrant here`.\n\nDo _not_ indicate 'new': 'add a new shop here' is incorrect, as the shop might have existed forever, it could just be unmapped!",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "tags": {
                 "description": "The tags to add. It determines the icon too",
@@ -1604,7 +1916,15 @@ export default {
                 }
               },
               "description": {
-                "description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)"
+                "description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "exampleImages": {
                 "description": "Example images, which show real-life pictures of what such a feature might look like\n\nType: image",
@@ -1679,6 +1999,9 @@ export default {
               {
                 "type": "object",
                 "properties": {
+                  "id": {
+                    "type": "string"
+                  },
                   "builtin": {
                     "anyOf": [
                       {
@@ -1701,28 +2024,6 @@ export default {
                   "override"
                 ]
               },
-              {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "type": "string"
-                  },
-                  "builtin": {
-                    "type": "array",
-                    "items": {
-                      "type": "string"
-                    }
-                  },
-                  "override": {
-                    "$ref": "#/definitions/Partial<QuestionableTagRenderingConfigJson>"
-                  }
-                },
-                "required": [
-                  "builtin",
-                  "id",
-                  "override"
-                ]
-              },
               {
                 "allOf": [
                   {
@@ -1829,6 +2130,438 @@ export default {
         "source"
       ]
     },
+    "Partial<LayerConfigJson>": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "description": "The id of this layer.\nThis should be a simple, lowercase, human readable string that is used to identify the layer.",
+          "type": "string"
+        },
+        "name": {
+          "description": "The name of this layer\nUsed in the layer control panel and the 'Personal theme'.\n\nIf not given, will be hidden (and thus not toggable) in the layer control",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "description": {
+          "description": "A description for this layer.\nShown in the layer selections and in the personel theme",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "source": {
+          "description": "This determines where the data for the layer is fetched: from OSM or from an external geojson dataset.\n\nIf no 'geojson' is defined, data will be fetched from overpass and the OSM-API.\n\nEvery source _must_ define which tags _must_ be present in order to be picked up.\n\nNote: a source must always be defined. 'special' is only allowed if this is a builtin-layer",
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "osmTags": {
+                  "$ref": "#/definitions/TagConfigJson",
+                  "description": "Every source must set which tags have to be present in order to load the given layer."
+                },
+                "maxCacheAge": {
+                  "description": "The maximum amount of seconds that a tile is allowed to linger in the cache",
+                  "type": "number"
+                }
+              },
+              "required": [
+                "osmTags"
+              ]
+            },
+            {
+              "type": "object",
+              "properties": {
+                "geoJson": {
+                  "description": "The actual source of the data to load, if loaded via geojson.\n\n# A single geojson-file\nsource: {geoJson: \"https://my.source.net/some-geo-data.geojson\"}\n fetches a geojson from a third party source\n\n# A tiled geojson source\nsource: {geoJson: \"https://my.source.net/some-tile-geojson-{layer}-{z}-{x}-{y}.geojson\", geoJsonZoomLevel: 14}\n to use a tiled geojson source. The web server must offer multiple geojsons. {z}, {x} and {y} are substituted by the location; {layer} is substituted with the id of the loaded layer\n\nSome API's use a BBOX instead of a tile, this can be used by specifying {y_min}, {y_max}, {x_min} and {x_max}",
+                  "type": "string"
+                },
+                "geoJsonZoomLevel": {
+                  "description": "To load a tiled geojson layer, set the zoomlevel of the tiles",
+                  "type": "number"
+                },
+                "isOsmCache": {
+                  "description": "Indicates that the upstream geojson data is OSM-derived.\nUseful for e.g. merging or for scripts generating this cache",
+                  "type": "boolean"
+                },
+                "mercatorCrs": {
+                  "description": "Some API's use a mercator-projection (EPSG:900913) instead of WGS84. Set the flag `mercatorCrs: true`  in the source for this",
+                  "type": "boolean"
+                },
+                "idKey": {
+                  "description": "Some API's have an id-field, but give it a different name.\nSetting this key will rename this field into 'id'",
+                  "type": "string"
+                }
+              },
+              "required": [
+                "geoJson"
+              ]
+            },
+            {
+              "enum": [
+                "special",
+                "special:library"
+              ],
+              "type": "string"
+            }
+          ]
+        },
+        "calculatedTags": {
+          "description": "A list of extra tags to calculate, specified as \"keyToAssignTo=javascript-expression\".\nThere are a few extra functions available. Refer to <a>Docs/CalculatedTags.md</a> for more information\nThe functions will be run in order, e.g.\n[\n \"_max_overlap_m2=Math.max(...feat.overlapsWith(\"someOtherLayer\").map(o => o.overlap))\n \"_max_overlap_ratio=Number(feat._max_overlap_m2)/feat.area\n]\n\nThe specified tags are evaluated lazily. E.g. if a calculated tag is only used in the popup (e.g. the number of nearby features),\nthe expensive calculation will only be performed then for that feature. This avoids clogging up the contributors PC when all features are loaded.\n\nIf a tag has to be evaluated strictly, use ':=' instead:\n\n[\n\"_some_key:=some_javascript_expression\"\n]",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "doNotDownload": {
+          "description": "If set, this layer will not query overpass; but it'll still match the tags above which are by chance returned by other layers.\nWorks well together with 'passAllFeatures', to add decoration",
+          "type": "boolean"
+        },
+        "isShown": {
+          "description": "If set, only features matching this extra tag will be shown.\nThis is useful to hide certain features from view.\n\nImportant: hiding features does not work dynamically, but is only calculated when the data is first renders.\nThis implies that it is not possible to hide a feature after a tagging change\n\nThe default value is 'yes'",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "forceLoad": {
+          "description": "Advanced option - might be set by the theme compiler\n\nIf true, this data will _always_ be loaded, even if the theme is disabled",
+          "type": "boolean"
+        },
+        "minzoom": {
+          "description": "The minimum needed zoomlevel required before loading of the data start\nDefault: 0",
+          "type": "number"
+        },
+        "shownByDefault": {
+          "description": "Indicates if this layer is shown by default;\ncan be used to hide a layer from start, or to load the layer but only to show it where appropriate (e.g. for snapping to it)",
+          "type": "boolean"
+        },
+        "minzoomVisible": {
+          "description": "The zoom level at which point the data is hidden again\nDefault: 100 (thus: always visible",
+          "type": "number"
+        },
+        "title": {
+          "description": "The title shown in a popup for elements of this layer.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/TagRenderingConfigJson"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "titleIcons": {
+          "description": "Small icons shown next to the title.\nIf not specified, the OsmLink and wikipedia links will be used by default.\nUse an empty array to hide them.\nNote that \"defaults\" will insert all the default titleIcons (which are added automatically)\n\nType: icon[]",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/TagRenderingConfigJson"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              }
+            },
+            {
+              "type": "array",
+              "items": [
+                {
+                  "type": "string",
+                  "enum": [
+                    "defaults"
+                  ]
+                }
+              ],
+              "minItems": 1,
+              "maxItems": 1
+            }
+          ]
+        },
+        "mapRendering": {
+          "description": "Visualisation of the items on the map",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/default_4"
+                  },
+                  {
+                    "$ref": "#/definitions/default_5"
+                  },
+                  {
+                    "$ref": "#/definitions/default<default|default|default[]|default[]>"
+                  }
+                ]
+              }
+            },
+            {
+              "type": "null"
+            }
+          ]
+        },
+        "passAllFeatures": {
+          "description": "If set, this layer will pass all the features it receives onto the next layer.\nThis is ideal for decoration, e.g. directionss on cameras",
+          "type": "boolean"
+        },
+        "presets": {
+          "description": "Presets for this layer.\nA preset shows up when clicking the map on a without data (or when right-clicking/long-pressing);\nit will prompt the user to add a new point.\n\nThe most important aspect are the tags, which define which tags the new point will have;\nThe title is shown in the dialog, along with the first sentence of the description.\n\nUpon confirmation, the full description is shown beneath the buttons - perfect to add pictures and examples.\n\nNote: the icon of the preset is determined automatically based on the tags and the icon above. Don't worry about that!\nNB: if no presets are defined, the popup to add new points doesn't show up at all",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "title": {
+                "description": "The title - shown on the 'add-new'-button.\n\nThis should include the article of the noun, e.g. 'a hydrant', 'a bicycle pump'.\nThis text will be inserted into `Add {category} here`, becoming `Add a hydrant here`.\n\nDo _not_ indicate 'new': 'add a new shop here' is incorrect, as the shop might have existed forever, it could just be unmapped!",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "tags": {
+                "description": "The tags to add. It determines the icon too",
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "description": {
+                "description": "The _first sentence_ of the description is shown on the button of the `add` menu.\nThe full description is shown in the confirmation dialog.\n\n(The first sentence is until the first '.'-character in the description)",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              },
+              "exampleImages": {
+                "description": "Example images, which show real-life pictures of what such a feature might look like\n\nType: image",
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              "preciseInput": {
+                "description": "If set, the user will prompted to confirm the location before actually adding the data.\nThis will be with a 'drag crosshair'-method.\n\nIf 'preferredBackgroundCategory' is set, the element will attempt to pick a background layer of that category.",
+                "anyOf": [
+                  {
+                    "type": "object",
+                    "properties": {
+                      "preferredBackground": {
+                        "description": "The type of background picture",
+                        "anyOf": [
+                          {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          {
+                            "type": "string"
+                          }
+                        ]
+                      },
+                      "snapToLayer": {
+                        "description": "If specified, these layers will be shown to and the new point will be snapped towards it",
+                        "anyOf": [
+                          {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          {
+                            "type": "string"
+                          }
+                        ]
+                      },
+                      "maxSnapDistance": {
+                        "description": "If specified, a new point will only be snapped if it is within this range.\nDistance in meter\n\nDefault: 10",
+                        "type": "number"
+                      }
+                    }
+                  },
+                  {
+                    "enum": [
+                      true
+                    ],
+                    "type": "boolean"
+                  }
+                ]
+              }
+            },
+            "required": [
+              "tags",
+              "title"
+            ]
+          }
+        },
+        "tagRenderings": {
+          "description": "All the tag renderings.\nA tag rendering is a block that either shows the known value or asks a question.\n\nRefer to the class `TagRenderingConfigJson` to see the possibilities.\n\nNote that we can also use a string here - where the string refers to a tag rendering defined in `assets/questions/questions.json`,\nwhere a few very general questions are defined e.g. website, phone number, ...\nFurthermore, _all_ the questions of another layer can be reused with `otherlayer.*`\nIf you need only a single of the tagRenderings, use `otherlayer.tagrenderingId`\nIf one or more questions have a 'group' or 'label' set, select all the entries with the corresponding group or label with `otherlayer.*group`\nRemark: if a tagRendering is 'lent' from another layer, the 'source'-tags are copied and added as condition.\nIf they are not wanted, remove them with an override\n\nA special value is 'questions', which indicates the location of the questions box. If not specified, it'll be appended to the bottom of the featureInfobox.\n\nAt last, one can define a group of renderings where parts of all strings will be replaced by multiple other strings.\nThis is mainly create questions for a 'left' and a 'right' side of the road.\nThese will be grouped and questions will be asked together",
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/QuestionableTagRenderingConfigJson"
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "id": {
+                    "type": "string"
+                  },
+                  "builtin": {
+                    "anyOf": [
+                      {
+                        "type": "array",
+                        "items": {
+                          "type": "string"
+                        }
+                      },
+                      {
+                        "type": "string"
+                      }
+                    ]
+                  },
+                  "override": {
+                    "$ref": "#/definitions/Partial<QuestionableTagRenderingConfigJson>"
+                  }
+                },
+                "required": [
+                  "builtin",
+                  "override"
+                ]
+              },
+              {
+                "allOf": [
+                  {
+                    "$ref": "#/definitions/default<(string|QuestionableTagRenderingConfigJson|{builtin:string;override:Partial<QuestionableTagRenderingConfigJson>;})[]>"
+                  },
+                  {
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "id"
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "string"
+              }
+            ]
+          }
+        },
+        "filter": {
+          "description": "All the extra questions for filtering.\nIf a string is given, mapComplete will search in 'filters.json' for the appropriate filter or will try to parse it as `layername.filterid` and us that one",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/default_1"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
+              }
+            },
+            {
+              "type": "object",
+              "properties": {
+                "sameAs": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "sameAs"
+              ]
+            }
+          ]
+        },
+        "deletion": {
+          "description": "This block defines under what circumstances the delete dialog is shown for objects of this layer.\nIf set, a dialog is shown to the user to (soft) delete the point.\nThe dialog is built to be user friendly and to prevent mistakes.\nIf deletion is not possible, the dialog will hide itself and show the reason of non-deletability instead.\n\nTo configure, the following values are possible:\n\n- false: never ever show the delete button\n- true: show the default delete button\n- undefined: use the mapcomplete default to show deletion or not. Currently, this is the same as 'false' but this will change in the future\n- or: a hash with options (see below)\n\n The delete dialog\n =================\n\n\n\n#### Hard deletion if enough experience\n\nA feature can only be deleted from OpenStreetMap by mapcomplete if:\n\n- It is a node\n- No ways or relations use the node\n- The logged-in user has enough experience OR the user is the only one to have edited the point previously\n- The logged-in user has no unread messages (or has a ton of experience)\n- The user did not select one of the 'non-delete-options' (see below)\n\nIn all other cases, a 'soft deletion' is used.\n\n#### Soft deletion\n\nA 'soft deletion' is when the point isn't deleted from OSM but retagged so that it'll won't how up in the mapcomplete theme anymore.\nThis makes it look like it was deleted, without doing damage. A fixme will be added to the point.\n\nNote that a soft deletion is _only_ possible if these tags are provided by the theme creator, as they'll be different for every theme\n\n#### No-delete options\n\nIn some cases, the contributor might want to delete something for the wrong reason (e.g. someone who wants to have a path removed \"because the path is on their private property\").\nHowever, the path exists in reality and should thus be on OSM - otherwise the next contributor will pass by and notice \"hey, there is a path missing here! Let me redraw it in OSM!)\n\nThe correct approach is to retag the feature in such a way that it is semantically correct *and* that it doesn't show up on the theme anymore.\nA no-delete option is offered as 'reason to delete it', but secretly retags.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/DeleteConfigJson"
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
+        "allowMove": {
+          "description": "Indicates if a point can be moved and configures the modalities.\n\nA feature can be moved by MapComplete if:\n\n- It is a point\n- The point is _not_ part of a way or a a relation.\n\nOff by default. Can be enabled by setting this flag or by configuring.",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/default_3"
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
+        "allowSplit": {
+          "description": "If set, a 'split this way' button is shown on objects rendered as LineStrings, e.g. highways.\n\nIf the way is part of a relation, MapComplete will attempt to update this relation as well",
+          "type": "boolean"
+        },
+        "units": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/default_2"
+          }
+        },
+        "syncSelection": {
+          "description": "If set, synchronizes whether or not this layer is enabled.\n\nno: Do not sync at all, always revert to default\nlocal: keep selection on local storage\ntheme-only: sync via OSM, but this layer will only be toggled in this theme\nglobal: all layers with this ID will be synced accross all themes",
+          "enum": [
+            "global",
+            "local",
+            "no",
+            "theme-only"
+          ],
+          "type": "string"
+        },
+        "#": {
+          "description": "Used for comments and/or to disable some checks\n\nno-question-hint-check: disables a check in MiscTagRenderingChecks which complains about 'div', 'span' or 'class=subtle'-HTML elements in the tagRendering",
+          "type": "string"
+        }
+      }
+    },
     "default": {
       "type": "object",
       "properties": {
diff --git a/Docs/Schemas/LineRenderingConfigJson.schema.json b/Docs/Schemas/LineRenderingConfigJson.schema.json
index c76fd695f5..744b13d2b7 100644
--- a/Docs/Schemas/LineRenderingConfigJson.schema.json
+++ b/Docs/Schemas/LineRenderingConfigJson.schema.json
@@ -146,6 +146,14 @@
       ],
       "additionalProperties": false
     },
+    "Record<string,string>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object",
+      "additionalProperties": false
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -210,10 +218,6 @@
       ],
       "additionalProperties": false
     },
-    "Record<string,string>": {
-      "type": "object",
-      "additionalProperties": false
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -222,10 +226,6 @@
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -233,11 +233,67 @@
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -255,6 +311,22 @@
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -279,7 +351,15 @@
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
diff --git a/Docs/Schemas/LineRenderingConfigJsonJSC.ts b/Docs/Schemas/LineRenderingConfigJsonJSC.ts
index ba475b1cee..db7177b6f9 100644
--- a/Docs/Schemas/LineRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/LineRenderingConfigJsonJSC.ts
@@ -144,6 +144,12 @@ export default {
         "or"
       ]
     },
+    "Record<string,string>": {
+      "type": "object"
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object"
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -207,9 +213,6 @@ export default {
         "canonicalDenomination"
       ]
     },
-    "Record<string,string>": {
-      "type": "object"
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -218,10 +221,6 @@ export default {
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -229,11 +228,67 @@ export default {
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -251,6 +306,22 @@ export default {
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -275,7 +346,15 @@ export default {
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
diff --git a/Docs/Schemas/MappingConfigJson.schema.json b/Docs/Schemas/MappingConfigJson.schema.json
index 2a33419bb5..2b5926dd83 100644
--- a/Docs/Schemas/MappingConfigJson.schema.json
+++ b/Docs/Schemas/MappingConfigJson.schema.json
@@ -162,6 +162,14 @@
       ],
       "additionalProperties": false
     },
+    "Record<string,string>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object",
+      "additionalProperties": false
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -226,10 +234,6 @@
       ],
       "additionalProperties": false
     },
-    "Record<string,string>": {
-      "type": "object",
-      "additionalProperties": false
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -238,10 +242,6 @@
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -249,11 +249,67 @@
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -271,6 +327,22 @@
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -295,7 +367,15 @@
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
diff --git a/Docs/Schemas/MappingConfigJsonJSC.ts b/Docs/Schemas/MappingConfigJsonJSC.ts
index d7ae48b03f..b53c9837b4 100644
--- a/Docs/Schemas/MappingConfigJsonJSC.ts
+++ b/Docs/Schemas/MappingConfigJsonJSC.ts
@@ -160,6 +160,12 @@ export default {
         "or"
       ]
     },
+    "Record<string,string>": {
+      "type": "object"
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object"
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -223,9 +229,6 @@ export default {
         "canonicalDenomination"
       ]
     },
-    "Record<string,string>": {
-      "type": "object"
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -234,10 +237,6 @@ export default {
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -245,11 +244,67 @@ export default {
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -267,6 +322,22 @@ export default {
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -291,7 +362,15 @@ export default {
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
diff --git a/Docs/Schemas/MoveConfigJson.schema.json b/Docs/Schemas/MoveConfigJson.schema.json
index b851d9fbb3..33c89a5bae 100644
--- a/Docs/Schemas/MoveConfigJson.schema.json
+++ b/Docs/Schemas/MoveConfigJson.schema.json
@@ -69,6 +69,14 @@
       ],
       "additionalProperties": false
     },
+    "Record<string,string>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object",
+      "additionalProperties": false
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -132,10 +140,6 @@
         "canonicalDenomination"
       ],
       "additionalProperties": false
-    },
-    "Record<string,string>": {
-      "type": "object",
-      "additionalProperties": false
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/Docs/Schemas/MoveConfigJsonJSC.ts b/Docs/Schemas/MoveConfigJsonJSC.ts
index f963559b92..2d2565825e 100644
--- a/Docs/Schemas/MoveConfigJsonJSC.ts
+++ b/Docs/Schemas/MoveConfigJsonJSC.ts
@@ -67,6 +67,12 @@ export default {
         "or"
       ]
     },
+    "Record<string,string>": {
+      "type": "object"
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object"
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -129,9 +135,6 @@ export default {
       "required": [
         "canonicalDenomination"
       ]
-    },
-    "Record<string,string>": {
-      "type": "object"
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#"
diff --git a/Docs/Schemas/PointRenderingConfigJson.schema.json b/Docs/Schemas/PointRenderingConfigJson.schema.json
index cb5fbcbf27..a8c0069fda 100644
--- a/Docs/Schemas/PointRenderingConfigJson.schema.json
+++ b/Docs/Schemas/PointRenderingConfigJson.schema.json
@@ -3,7 +3,7 @@
   "type": "object",
   "properties": {
     "location": {
-      "description": "All the locations that this point should be rendered at.\nUsing `location: [\"point\", \"centroid\"] will always render centerpoint.\n'projected_centerpoint' will show an item on the line itself, near the middle of the line. (LineStrings only)",
+      "description": "All the locations that this point should be rendered at.\nPossible values are:\n- `point`: only renders points at their location\n- `centroid`: show a symbol at the centerpoint of a (multi)Linestring and (multi)polygon. Points will _not_ be rendered with this\n- `projected_centerpoint`: Only on (multi)linestrings: calculate the centerpoint and snap it to the way\n- `start` and `end`: only on linestrings: add a point to the first/last coordinate of the LineString",
       "type": "array",
       "items": {
         "type": "string"
@@ -82,7 +82,7 @@
       ]
     },
     "css": {
-      "description": "A snippet of css code",
+      "description": "A snippet of css code which is applied onto the container of the entire marker",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -93,7 +93,7 @@
       ]
     },
     "cssClasses": {
-      "description": "A snippet of css-classes. They can be space-separated",
+      "description": "A snippet of css-classes which are applied onto the container of the entire marker. They can be space-separated",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -102,6 +102,58 @@
           "type": "string"
         }
       ]
+    },
+    "labelCss": {
+      "description": "Css that is applied onto the label",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TagRenderingConfigJson"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "labelCssClasses": {
+      "description": "Css classes that are applied onto the label; can be space-separated",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TagRenderingConfigJson"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "pitchAlignment": {
+      "description": "If the map is pitched, the marker will stay parallel to the screen.\nSet to 'map' if you want to put it flattened on the map",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TagRenderingConfigJson"
+        },
+        {
+          "enum": [
+            "canvas",
+            "map"
+          ],
+          "type": "string"
+        }
+      ]
+    },
+    "rotationAlignment": {
+      "description": "If the map is rotated, the icon will still point to the north if no rotation was applied",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TagRenderingConfigJson"
+        },
+        {
+          "enum": [
+            "canvas",
+            "map"
+          ],
+          "type": "string"
+        }
+      ]
     }
   },
   "required": [
@@ -166,6 +218,14 @@
       ],
       "additionalProperties": false
     },
+    "Record<string,string>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object",
+      "additionalProperties": false
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -230,10 +290,6 @@
       ],
       "additionalProperties": false
     },
-    "Record<string,string>": {
-      "type": "object",
-      "additionalProperties": false
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -242,10 +298,6 @@
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -253,11 +305,67 @@
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -275,6 +383,22 @@
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -299,7 +423,15 @@
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
diff --git a/Docs/Schemas/PointRenderingConfigJsonJSC.ts b/Docs/Schemas/PointRenderingConfigJsonJSC.ts
index 0a63aafeaa..974a1735f8 100644
--- a/Docs/Schemas/PointRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/PointRenderingConfigJsonJSC.ts
@@ -3,7 +3,7 @@ export default {
   "type": "object",
   "properties": {
     "location": {
-      "description": "All the locations that this point should be rendered at.\nUsing `location: [\"point\", \"centroid\"] will always render centerpoint.\n'projected_centerpoint' will show an item on the line itself, near the middle of the line. (LineStrings only)",
+      "description": "All the locations that this point should be rendered at.\nPossible values are:\n- `point`: only renders points at their location\n- `centroid`: show a symbol at the centerpoint of a (multi)Linestring and (multi)polygon. Points will _not_ be rendered with this\n- `projected_centerpoint`: Only on (multi)linestrings: calculate the centerpoint and snap it to the way\n- `start` and `end`: only on linestrings: add a point to the first/last coordinate of the LineString",
       "type": "array",
       "items": {
         "type": "string"
@@ -82,7 +82,7 @@ export default {
       ]
     },
     "css": {
-      "description": "A snippet of css code",
+      "description": "A snippet of css code which is applied onto the container of the entire marker",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -93,7 +93,7 @@ export default {
       ]
     },
     "cssClasses": {
-      "description": "A snippet of css-classes. They can be space-separated",
+      "description": "A snippet of css-classes which are applied onto the container of the entire marker. They can be space-separated",
       "anyOf": [
         {
           "$ref": "#/definitions/TagRenderingConfigJson"
@@ -102,6 +102,58 @@ export default {
           "type": "string"
         }
       ]
+    },
+    "labelCss": {
+      "description": "Css that is applied onto the label",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TagRenderingConfigJson"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "labelCssClasses": {
+      "description": "Css classes that are applied onto the label; can be space-separated",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TagRenderingConfigJson"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "pitchAlignment": {
+      "description": "If the map is pitched, the marker will stay parallel to the screen.\nSet to 'map' if you want to put it flattened on the map",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TagRenderingConfigJson"
+        },
+        {
+          "enum": [
+            "canvas",
+            "map"
+          ],
+          "type": "string"
+        }
+      ]
+    },
+    "rotationAlignment": {
+      "description": "If the map is rotated, the icon will still point to the north if no rotation was applied",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/TagRenderingConfigJson"
+        },
+        {
+          "enum": [
+            "canvas",
+            "map"
+          ],
+          "type": "string"
+        }
+      ]
     }
   },
   "required": [
@@ -164,6 +216,12 @@ export default {
         "or"
       ]
     },
+    "Record<string,string>": {
+      "type": "object"
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object"
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -227,9 +285,6 @@ export default {
         "canonicalDenomination"
       ]
     },
-    "Record<string,string>": {
-      "type": "object"
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -238,10 +293,6 @@ export default {
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -249,11 +300,67 @@ export default {
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -271,6 +378,22 @@ export default {
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -295,7 +418,15 @@ export default {
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
diff --git a/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json b/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json
index f7529d6d2a..2eabe2ca60 100644
--- a/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json
+++ b/Docs/Schemas/QuestionableTagRenderingConfigJson.schema.json
@@ -51,7 +51,7 @@
           }
         },
         "inline": {
-          "description": "When set, influences the way a question is asked.\nInstead of showing a full-widht text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.",
+          "description": "When set, influences the way a question is asked.\nInstead of showing a full-width text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.\nNote that this will be set automatically if no special elements are present.",
           "type": "boolean"
         },
         "default": {
@@ -78,10 +78,6 @@
       "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
       "type": "string"
     },
-    "group": {
-      "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-      "type": "string"
-    },
     "labels": {
       "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
       "type": "array",
@@ -89,11 +85,67 @@
         "type": "string"
       }
     },
+    "classes": {
+      "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+      "anyOf": [
+        {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
     "description": {
-      "description": "A human-readable text explaining what this tagRendering does"
+      "description": "A human-readable text explaining what this tagRendering does",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "render": {
-      "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+      "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "special": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "type"
+                  ]
+                }
+              ]
+            }
+          },
+          "required": [
+            "special"
+          ]
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "condition": {
       "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -110,6 +162,22 @@
           "type": "string"
         }
       ]
+    },
+    "metacondition": {
+      "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/AndTagConfigJson",
+          "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+        },
+        {
+          "$ref": "#/definitions/OrTagConfigJson",
+          "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+        },
+        {
+          "type": "string"
+        }
+      ]
     }
   },
   "definitions": {
@@ -171,6 +239,14 @@
       ],
       "additionalProperties": false
     },
+    "Record<string,string>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object",
+      "additionalProperties": false
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -235,10 +311,6 @@
       ],
       "additionalProperties": false
     },
-    "Record<string,string>": {
-      "type": "object",
-      "additionalProperties": false
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -247,10 +319,6 @@
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -258,11 +326,67 @@
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -280,6 +404,22 @@
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -304,7 +444,15 @@
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
diff --git a/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts b/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts
index 8db0039d61..b0b2b16893 100644
--- a/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/QuestionableTagRenderingConfigJsonJSC.ts
@@ -51,7 +51,7 @@ export default {
           }
         },
         "inline": {
-          "description": "When set, influences the way a question is asked.\nInstead of showing a full-widht text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.",
+          "description": "When set, influences the way a question is asked.\nInstead of showing a full-width text field, the text field will be shown within the rendering of the question.\n\nThis combines badly with special input elements, as it'll distort the layout.\nNote that this will be set automatically if no special elements are present.",
           "type": "boolean"
         },
         "default": {
@@ -78,10 +78,6 @@ export default {
       "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
       "type": "string"
     },
-    "group": {
-      "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-      "type": "string"
-    },
     "labels": {
       "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
       "type": "array",
@@ -89,11 +85,67 @@ export default {
         "type": "string"
       }
     },
+    "classes": {
+      "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+      "anyOf": [
+        {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
     "description": {
-      "description": "A human-readable text explaining what this tagRendering does"
+      "description": "A human-readable text explaining what this tagRendering does",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "render": {
-      "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+      "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "special": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "type"
+                  ]
+                }
+              ]
+            }
+          },
+          "required": [
+            "special"
+          ]
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "condition": {
       "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -110,6 +162,22 @@ export default {
           "type": "string"
         }
       ]
+    },
+    "metacondition": {
+      "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/AndTagConfigJson",
+          "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+        },
+        {
+          "$ref": "#/definitions/OrTagConfigJson",
+          "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+        },
+        {
+          "type": "string"
+        }
+      ]
     }
   },
   "definitions": {
@@ -169,6 +237,12 @@ export default {
         "or"
       ]
     },
+    "Record<string,string>": {
+      "type": "object"
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object"
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -232,9 +306,6 @@ export default {
         "canonicalDenomination"
       ]
     },
-    "Record<string,string>": {
-      "type": "object"
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -243,10 +314,6 @@ export default {
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -254,11 +321,67 @@ export default {
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -276,6 +399,22 @@ export default {
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -300,7 +439,15 @@ export default {
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
diff --git a/Docs/Schemas/RewritableConfigJson.schema.json b/Docs/Schemas/RewritableConfigJson.schema.json
index 477a3f981b..01dbd836fa 100644
--- a/Docs/Schemas/RewritableConfigJson.schema.json
+++ b/Docs/Schemas/RewritableConfigJson.schema.json
@@ -91,6 +91,14 @@
       ],
       "additionalProperties": false
     },
+    "Record<string,string>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object",
+      "additionalProperties": false
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -155,10 +163,6 @@
       ],
       "additionalProperties": false
     },
-    "Record<string,string>": {
-      "type": "object",
-      "additionalProperties": false
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -167,10 +171,6 @@
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -178,11 +178,67 @@
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -200,6 +256,22 @@
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -224,7 +296,15 @@
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
diff --git a/Docs/Schemas/RewritableConfigJsonJSC.ts b/Docs/Schemas/RewritableConfigJsonJSC.ts
index 6c1e7fac5a..b173395d57 100644
--- a/Docs/Schemas/RewritableConfigJsonJSC.ts
+++ b/Docs/Schemas/RewritableConfigJsonJSC.ts
@@ -89,6 +89,12 @@ export default {
         "or"
       ]
     },
+    "Record<string,string>": {
+      "type": "object"
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object"
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -152,9 +158,6 @@ export default {
         "canonicalDenomination"
       ]
     },
-    "Record<string,string>": {
-      "type": "object"
-    },
     "TagRenderingConfigJson": {
       "description": "A TagRenderingConfigJson is a single piece of code which converts one ore more tags into a HTML-snippet.\nFor an _editable_ tagRendering, use 'QuestionableTagRenderingConfigJson' instead, which extends this one",
       "type": "object",
@@ -163,10 +166,6 @@ export default {
           "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
           "type": "string"
         },
-        "group": {
-          "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-          "type": "string"
-        },
         "labels": {
           "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
           "type": "array",
@@ -174,11 +173,67 @@ export default {
             "type": "string"
           }
         },
+        "classes": {
+          "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "description": {
-          "description": "A human-readable text explaining what this tagRendering does"
+          "description": "A human-readable text explaining what this tagRendering does",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "render": {
-          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+          "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/Record<string,string>"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "special": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "type"
+                      ]
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "special"
+              ]
+            },
+            {
+              "type": "string"
+            }
+          ]
         },
         "condition": {
           "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -196,6 +251,22 @@ export default {
             }
           ]
         },
+        "metacondition": {
+          "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+          "anyOf": [
+            {
+              "$ref": "#/definitions/AndTagConfigJson",
+              "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "$ref": "#/definitions/OrTagConfigJson",
+              "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
         "freeform": {
           "description": "Allow freeform text input from the user",
           "type": "object",
@@ -220,7 +291,15 @@ export default {
                 "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
               },
               "then": {
-                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+                "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+                "anyOf": [
+                  {
+                    "$ref": "#/definitions/Record<string,string>"
+                  },
+                  {
+                    "type": "string"
+                  }
+                ]
               },
               "icon": {
                 "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
diff --git a/Docs/Schemas/TagRenderingConfigJson.schema.json b/Docs/Schemas/TagRenderingConfigJson.schema.json
index 1f09125f47..3453db4dee 100644
--- a/Docs/Schemas/TagRenderingConfigJson.schema.json
+++ b/Docs/Schemas/TagRenderingConfigJson.schema.json
@@ -6,10 +6,6 @@
       "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
       "type": "string"
     },
-    "group": {
-      "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-      "type": "string"
-    },
     "labels": {
       "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
       "type": "array",
@@ -17,11 +13,67 @@
         "type": "string"
       }
     },
+    "classes": {
+      "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+      "anyOf": [
+        {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
     "description": {
-      "description": "A human-readable text explaining what this tagRendering does"
+      "description": "A human-readable text explaining what this tagRendering does",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "render": {
-      "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+      "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "special": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "type"
+                  ]
+                }
+              ]
+            }
+          },
+          "required": [
+            "special"
+          ]
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "condition": {
       "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -39,6 +91,22 @@
         }
       ]
     },
+    "metacondition": {
+      "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/AndTagConfigJson",
+          "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+        },
+        {
+          "$ref": "#/definitions/OrTagConfigJson",
+          "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
     "freeform": {
       "description": "Allow freeform text input from the user",
       "type": "object",
@@ -63,7 +131,15 @@
             "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
           },
           "then": {
-            "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+            "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/Record<string,string>"
+              },
+              {
+                "type": "string"
+              }
+            ]
           },
           "icon": {
             "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
@@ -155,6 +231,14 @@
         "or"
       ],
       "additionalProperties": false
+    },
+    "Record<string,string>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object",
+      "additionalProperties": false
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/Docs/Schemas/TagRenderingConfigJsonJSC.ts b/Docs/Schemas/TagRenderingConfigJsonJSC.ts
index f3823873a0..c2bdd5fe09 100644
--- a/Docs/Schemas/TagRenderingConfigJsonJSC.ts
+++ b/Docs/Schemas/TagRenderingConfigJsonJSC.ts
@@ -6,10 +6,6 @@ export default {
       "description": "The id of the tagrendering, should be an unique string.\nUsed to keep the translations in sync. Only used in the tagRenderings-array of a layerConfig, not requered otherwise.\n\nUse 'questions' to trigger the question box of this group (if a group is defined)",
       "type": "string"
     },
-    "group": {
-      "description": "If 'group' is defined on many tagRenderings, these are grouped together when shown. The questions are grouped together as well.\nThe first tagRendering of a group will always be a sticky element.",
-      "type": "string"
-    },
     "labels": {
       "description": "A list of labels. These are strings that are used for various purposes, e.g. to filter them away",
       "type": "array",
@@ -17,11 +13,67 @@ export default {
         "type": "string"
       }
     },
+    "classes": {
+      "description": "A list of css-classes to apply to the entire tagRendering if the answer is known (not applied on the question).\nThis is only for advanced users",
+      "anyOf": [
+        {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
     "description": {
-      "description": "A human-readable text explaining what this tagRendering does"
+      "description": "A human-readable text explaining what this tagRendering does",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "render": {
-      "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered"
+      "description": "Renders this value. Note that \"{key}\"-parts are substituted by the corresponding values of the element.\nIf neither 'textFieldQuestion' nor 'mappings' are defined, this text is simply shown as default value.\n\nNote that this is a HTML-interpreted value, so you can add links as e.g. '<a href='{website}'>{website}</a>' or include images such as `This is of type A <br><img src='typeA-icon.svg' />`\ntype: rendered",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/Record<string,string>"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "special": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/Record<string,string|Record<string,string>>"
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "type": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "type"
+                  ]
+                }
+              ]
+            }
+          },
+          "required": [
+            "special"
+          ]
+        },
+        {
+          "type": "string"
+        }
+      ]
     },
     "condition": {
       "description": "Only show this tagrendering (or ask the question) if the selected object also matches the tags specified as `condition`.\n\nThis is useful to ask a follow-up question.\nFor example, within toilets, asking _where_ the diaper changing table is is only useful _if_ there is one.\nThis can be done by adding `\"condition\": \"changing_table=yes\"`\n\nA full example would be:\n```json\n    {\n      \"question\": \"Where is the changing table located?\",\n      \"render\": \"The changing table is located at {changing_table:location}\",\n      \"condition\": \"changing_table=yes\",\n      \"freeform\": {\n        \"key\": \"changing_table:location\",\n        \"inline\": true\n      },\n      \"mappings\": [\n        {\n          \"then\": \"The changing table is in the toilet for women.\",\n          \"if\": \"changing_table:location=female_toilet\"\n        },\n        {\n          \"then\": \"The changing table is in the toilet for men.\",\n          \"if\": \"changing_table:location=male_toilet\"\n        },\n        {\n          \"if\": \"changing_table:location=wheelchair_toilet\",\n          \"then\": \"The changing table is in the toilet for wheelchair users.\",\n        },\n        {\n          \"if\": \"changing_table:location=dedicated_room\",\n          \"then\": \"The changing table is in a dedicated room. \",\n        }\n      ],\n      \"id\": \"toilet-changing_table:location\"\n    },\n```",
@@ -39,6 +91,22 @@ export default {
         }
       ]
     },
+    "metacondition": {
+      "description": "If set, this tag will be evaluated agains the _usersettings/application state_ table.\nEnable 'show debug info' in user settings to see available options.\nNote that values with an underscore depicts _application state_ (including metainfo about the user) whereas values without an underscore depict _user settings_",
+      "anyOf": [
+        {
+          "$ref": "#/definitions/AndTagConfigJson",
+          "description": "Chain many tags, to match, a single of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+        },
+        {
+          "$ref": "#/definitions/OrTagConfigJson",
+          "description": "Chain many tags, to match, all of these should be true\nSee https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md for documentation"
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
     "freeform": {
       "description": "Allow freeform text input from the user",
       "type": "object",
@@ -63,7 +131,15 @@ export default {
             "description": "If this condition is met, then the text under `then` will be shown.\nIf no value matches, and the user selects this mapping as an option, then these tags will be uploaded to OSM.\n\nFor example: {'if': 'diet:vegetarion=yes', 'then':'A vegetarian option is offered here'}\n\nThis can be an substituting-tag as well, e.g. {'if': 'addr:street:={_calculated_nearby_streetname}', 'then': '{_calculated_nearby_streetname}'}"
           },
           "then": {
-            "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered"
+            "description": "If the condition `if` is met, the text `then` will be rendered.\nIf not known yet, the user will be presented with `then` as an option\nType: rendered",
+            "anyOf": [
+              {
+                "$ref": "#/definitions/Record<string,string>"
+              },
+              {
+                "type": "string"
+              }
+            ]
           },
           "icon": {
             "description": "An icon supporting this mapping; typically shown pretty small\nType: icon",
@@ -153,6 +229,12 @@ export default {
       "required": [
         "or"
       ]
+    },
+    "Record<string,string>": {
+      "type": "object"
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object"
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#"
diff --git a/Docs/Schemas/UnitConfigJson.schema.json b/Docs/Schemas/UnitConfigJson.schema.json
index 6d885363bb..6249972229 100644
--- a/Docs/Schemas/UnitConfigJson.schema.json
+++ b/Docs/Schemas/UnitConfigJson.schema.json
@@ -88,6 +88,14 @@
       ],
       "additionalProperties": false
     },
+    "Record<string,string>": {
+      "type": "object",
+      "additionalProperties": false
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object",
+      "additionalProperties": false
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -151,10 +159,6 @@
         "canonicalDenomination"
       ],
       "additionalProperties": false
-    },
-    "Record<string,string>": {
-      "type": "object",
-      "additionalProperties": false
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#",
diff --git a/Docs/Schemas/UnitConfigJsonJSC.ts b/Docs/Schemas/UnitConfigJsonJSC.ts
index b4b06c4694..857c15586d 100644
--- a/Docs/Schemas/UnitConfigJsonJSC.ts
+++ b/Docs/Schemas/UnitConfigJsonJSC.ts
@@ -86,6 +86,12 @@ export default {
         "or"
       ]
     },
+    "Record<string,string>": {
+      "type": "object"
+    },
+    "Record<string,string|Record<string,string>>": {
+      "type": "object"
+    },
     "DenominationConfigJson": {
       "type": "object",
       "properties": {
@@ -148,9 +154,6 @@ export default {
       "required": [
         "canonicalDenomination"
       ]
-    },
-    "Record<string,string>": {
-      "type": "object"
     }
   },
   "$schema": "http://json-schema.org/draft-07/schema#"