diff --git a/assets/themes/trees/leafless.svg b/assets/themes/trees/leafless.svg
new file mode 100644
index 0000000..b3f285d
--- /dev/null
+++ b/assets/themes/trees/leafless.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<filter id="a" x="-.15859" y="-.51947" width="1.3172" height="2.0389" color-interpolation-filters="sRGB">
+			<feGaussianBlur stdDeviation="1.5643811"/>
+		</filter>
+	</defs>
+	<path d="m30.286 26.313c-1.0397 0-2.2465 0.21032-2.7528 0.47141l-7.4788 3.8744h-1.4367c-1.1591 0-1.6245-0.22548-1.0969-0.51658l3.8457-2.1216c0.47458-0.26182 0.03608-0.47414-1.0063-0.47418-1.0426-3.4e-5 -2.2705 0.21231-2.769 0.47418l-4.0386 2.1216c-1.5796 0.82979-0.09108 1.5134 3.2129 1.5134h1.4367l-3.3842 1.8213s0.84357 0.06365 2.0382 0.06365 2.2742-0.06365 2.2742-0.06365l1.6997-0.91473h1.4346c3.304 0 7.3155-0.68358 8.8371-1.5134l5.2928-2.8864c0.49298-0.26545 0.03598-0.48063-1.0209-0.4806-1.0567 3.5e-5 -2.3131 0.2152-2.8065 0.4806l-5.4337 2.8864c-0.54803 0.29111-1.8576 0.51658-3.0166 0.51658h-1.4346s1.6157-0.86026 2.3977-1.2904c2.1158-1.1637 6.2066-3.4907 6.2066-3.4907 0.46423-0.26109 0.03925-0.47141-1.0005-0.47141z" filter="url(#a)" opacity=".3"/>
+	<path d="m17.005 4.8358c-1.0397 0-1.8557 0.83736-1.8769 1.8769l-0.27958 15.426h-1.4367c-1.1591 0-2.0435-0.89775-2.0567-2.0567l-0.09648-8.4468c-0.011911-1.0424-0.84494-1.8878-1.8874-1.8879-1.0427-1.358e-4 -1.876 0.84531-1.8879 1.8879l-0.096484 8.4468c-0.037737 3.3037 2.7211 6.0255 6.025 6.0255h1.4367v7.2513s0.96186 0.25344 2.1565 0.25344 2.156-0.25344 2.156-0.25344v-3.6419h1.4346c3.304 0 6.0453-2.7216 6.025-6.0255l-0.07043-11.492c-2.56e-4 -1.0569-0.8571-1.9136-1.914-1.9135-1.0567 1.4e-4 -1.9132 0.8568-1.9135 1.9135l-0.07043 11.492c-0.0071 1.159-0.89768 2.0567-2.0567 2.0567h-1.4346s0.01722-3.4251 0-5.1375c-0.04659-4.6333-0.27957-13.898-0.27957-13.898-0.020912-1.0395-0.83669-1.8769-1.8764-1.8769z" fill="#008000" stroke="#165016" stroke-linecap="round" stroke-miterlimit="10" stroke-width=".52917"/>
+	<g fill="none" stroke="#165016">
+		<g stroke-width=".26459px">
+			<path d="m7.3567 13.612-0.87638-0.50598"/>
+			<path d="m25.167 18.312v-1.012"/>
+			<path d="m20.596 25.748v-1.012"/>
+			<path d="m19.135 9.4531 0.76566-0.66168"/>
+		</g>
+		<path d="m13.559 22.676v-1.5164" stroke-width=".26458px"/>
+		<g stroke-width=".26459px">
+			<path d="m14.835 13.878-0.76566-0.66168"/>
+			<path d="m9.1202 14.749-0.14766-1.0011"/>
+			<path d="m18.101 19.814v-1.012"/>
+			<path d="m16.421 4.9697-0.28971-0.96959"/>
+		</g>
+		<path d="m15.445 30.47-1.3054-0.54959" stroke-width=".26458px"/>
+	</g>
+</svg>
diff --git a/assets/themes/trees/trees.json b/assets/themes/trees/trees.json
index 32c76c1..07dc9b3 100644
--- a/assets/themes/trees/trees.json
+++ b/assets/themes/trees/trees.json
@@ -50,8 +50,8 @@
       "tagRenderings": [
         {
           "render": {
-            "nl": "Bladertype van deze boom:",
-            "en": "Leaf type of this tree:"
+            "nl": "Bladertype van de boom:",
+            "en": "Leaf type of the tree:"
           },
           "question": {
             "nl": "Is dit een naald- of loofboom?",
@@ -65,8 +65,8 @@
                 ]
               },
               "then": {
-                "nl": "<img src=\"./assets/themes/trees/broadleaved.svg\" style=\"width:1.5em;height:1.5em\" alt=\"\"/> loofboom",
-                "en": "<img src=\"./assets/themes/trees/broadleaved.svg\" style=\"width:1.5em;height:1.5em\" alt=\"\"/> broadleaved"
+                "nl": "Dit is een <img src=\"./assets/themes/trees/broadleaved.svg\" style=\"width:1.5em;height:1.5em\" alt=\"\"/> loofboom",
+                "en": "This tree is <img src=\"./assets/themes/trees/broadleaved.svg\" style=\"width:1.5em;height:1.5em\" alt=\"\"/> broadleaved"
               }
             },
             {
@@ -76,36 +76,133 @@
                 ]
               },
               "then": {
-                "nl": "<img src=\"./assets/themes/trees/needleleaved.svg\" style=\"width:1.5em;height:1.5em\" alt=\"\"/> naaldboom",
-                "en": "<img src=\"./assets/themes/trees/needleleaved.svg\" style=\"width:1.5em;height:1.5em\" alt=\"\"/> needleleaved"
+                "nl": "Dit is een <img src=\"./assets/themes/trees/needleleaved.svg\" style=\"width:1.5em;height:1.5em\" alt=\"\"/> naaldboom",
+                "en": "This tree is <img src=\"./assets/themes/trees/needleleaved.svg\" style=\"width:1.5em;height:1.5em\" alt=\"\"/> needleleaved"
               }
             },
             {
               "if": {
                 "and": [
-                  "leaf_type=needleleaved"
+                  "leaf_type=leafless"
                 ]
               },
               "then": {
-                "nl": "permanent bladloos",
-                "en": "permanently leafless"
+                "nl": "Deze boom is <img src=\"./assets/themes/trees/leafless.svg\" style=\"width:1.5em;height:1.5em\" alt=\"\"/> permanent bladloos",
+                "en": "This tree is <img src=\"./assets/themes/trees/leafless.svg\" style=\"width:1.5em;height:1.5em\" alt=\"\"/> permanently leafless"
+              },
+              "hideInAnswer": true
+            }
+          ]
+        },
+        {
+          "render": {
+            "nl": "Significantie van de boom:",
+            "en": "Significance of the tree:"
+          },
+          "question": {
+            "nl": "Hoe significant is deze boom? Kies het eerste antwoord dat van toepassing is.",
+            "en": "How significant is this tree? Choose the first answer that applies."
+          },
+          "mappings": [
+            {
+              "if": {
+                "and": [
+                  "denotation=natural_monument"
+                ]
+              },
+              "then": {
+                "nl": "De boom is houtig erfgoed. Hij is bijzonder oud of van een zeldzame soort.",
+                "en": "The tree is a natural monument. It may be especially old, a valuable species."
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "denotation=landmark"
+                ]
+              },
+              "then": {
+                "nl": "De boom valt op door zijn grootte of prominente locatie. Hij is nuttig voor navigatie.",
+                "en": "The tree is remarkable due to its size or prominent location. It is useful for navigation."
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "denotation=agricultural"
+                ]
+              },
+              "then": {
+                "nl": "De boom wordt voor landbouwdoeleinden gebruikt, bijvoorbeeld in een boomgaard.",
+                "en": "The tree is used for agricultural purposes, e.g. in an orchard."
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "denotation=park"
+                ]
+              },
+              "then": {
+                "nl": "De boom staat in een park of dergelijke (begraafplaats, schoolterrein, …).",
+                "en": "The tree is in a park or similar (cemetery, school grounds, …)."
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "denotation=garden"
+                ]
+              },
+              "then": {
+                "nl": "De boom staat in de tuin bij een woning/flatgebouw.",
+                "en": "The tree is a residential garden."
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "denotation=avenue"
+                ]
+              },
+              "then": {
+                "nl": "Dit is een laanboom.",
+                "en": "This is a tree along an avenue."
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "denotation=urban"
+                ]
+              },
+              "then": {
+                "nl": "De boom staat in een woonkern.",
+                "en": "The tree is an urban area."
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "denotation=none"
+                ]
+              },
+              "then": {
+                "nl": "De boom staat buiten een woonkern.",
+                "en": "The tree is outside of an urban area."
               }
             }
           ]
         },
         {
           "render": {
-            "nl": "Bladercyclus van deze boom:",
-            "en": "Leaf cycle of this tree:"
+            "nl": "Bladercyclus van de boom:",
+            "en": "Leaf cycle of the tree:"
           },
           "question": {
             "nl": "Is deze boom bladhoudend of bladverliezend?",
             "en": "Is this tree evergreen or deciduous?"
           },
-          "freeform": {
-            "key": null,
-            "addExtraTags": []
-          },
           "mappings": [
             {
               "if": {
@@ -169,6 +266,34 @@
         "render": "#00f"
       },
       "presets": [
+        {
+          "tags": [
+            "natural=tree",
+            "leaf_type=broadleaved"
+          ],
+          "title": {
+            "nl": "Loofboom",
+            "en": "Broadleaved tree"
+          },
+          "description": {
+            "nl": "Gebruik indien mogelijk de luchtfoto's om de boom zo nauwkeurig mogelijk te plaatsen.",
+            "en": "Use the aerial photos (if available) to position the tree as accurately as possible."
+          }
+        },
+        {
+          "tags": [
+            "natural=tree",
+            "leaf_type=needleleaved"
+          ],
+          "title": {
+            "nl": "Naaldboom",
+            "en": "Needleleaved tree"
+          },
+          "description": {
+            "nl": "Gebruik indien mogelijk de luchtfoto's om de boom zo nauwkeurig mogelijk te plaatsen.",
+            "en": "Use the aerial photos (if available) to position the tree as accurately as possible."
+          }
+        },
         {
           "tags": [
             "natural=tree"