--- defaultpresets.xml	2018-04-24 16:04:06.659858822 +0200
+++ defaultpresets.xml.new	2018-04-24 17:04:53.074880577 +0200
@@ -262,8 +262,8 @@
         <text key="taxon" text="Taxon" />
     </chunk>
     <chunk id="leaf">
-        <combo key="leaf_type" text="Type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" />
-        <combo key="leaf_cycle" text="Cycle" values_searchable="true" >
+        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" />
+        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
             <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
             <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
             <list_entry value="semi_deciduous" short_description="Plants that lose their foliage for a very short period, when old leaves fall off and new foliage growth is starting." />
@@ -271,6 +271,15 @@
             <list_entry value="mixed" short_description="Habitat with evergreen and deciduous vegetation." />
         </combo>
     </chunk>
+    <chunk id="leaf_no_mixed">
+        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless" values_searchable="true" />
+        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
+            <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
+            <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
+            <list_entry value="semi_deciduous" short_description="Plants that lose their foliage for a very short period, when old leaves fall off and new foliage growth is starting." />
+            <list_entry value="semi_evergreen" short_description="Plants that lose most, but not all, of their foliage for a fraction of the year." />
+        </combo>
+    </chunk>
     <chunk id="religious">
         <text key="name" text="Name" />
         <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" />
@@ -10471,6 +10480,12 @@
         </item> <!-- Reef -->
     </group> <!-- Geography -->
     <group name="Nature" icon="presets/landmark/trees.svg">
+        <item name="Tree Stump" icon="presets/landmark/tree_stump.svg" type="node" preset_name_label="true">
+            <link href="https://wiki.openstreetmap.org/wiki/Tag:natural=tree_stump" />
+            <label text="A single tree stump." />
+            <space />
+            <key key="natural" value="tree_stump" />
+        </item> <!-- Tree Stump -->
         <item name="Tree" icon="presets/landmark/trees.svg" type="node" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:natural=tree"
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:natural=tree"
@@ -10487,11 +10502,11 @@
             <label text="A single tree." />
             <space />
             <key key="natural" value="tree" />
-            <text key="name" text="Name" />
             <text key="height" text="Height (meters)" />
             <text key="circumference" text="Circumference (meters)" />
+            <text key="diameter_crown" text="Diameter crown (meters)" />
+            <reference ref="leaf_no_mixed" />
             <reference ref="genus_species_taxon" />
-            <reference ref="leaf" />
             <combo key="denotation" text="Denotation" values_searchable="true" values_context="tree denotation" >
                 <list_entry value="landmark" short_description="Trees remarkable due to its size or prominent location, usually visible from great distances and useful for navigation." />
                 <list_entry value="natural_monument" short_description="Especially old tree, often with a particular shape. Usually protected for its uniqueness." />
@@ -10499,6 +10514,12 @@
                 <list_entry value="urban" short_description="Trees found within settlements, e.g. in parks or spread through residential areas." />
                 <list_entry value="agricultural" short_description="Trees in agricultural use." />
             </combo>
+            <optional>
+                <text key="name" text="Name" />
+                <text key="operator" text="Operator" />
+                <text key="start_date" text="Start date" />
+                <text key="check_date" text="Check date" />
+            </optional>
         </item> <!-- Tree -->
         <item name="Tree Row" icon="presets/landmark/tree_row.svg" type="way" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:natural=tree_row"
@@ -10516,8 +10537,9 @@
             <key key="natural" value="tree_row" />
             <text key="height" text="Height (meters)" />
             <optional>
-                <reference ref="genus_species_taxon" />
                 <reference ref="leaf" />
+                <reference ref="genus_species_taxon" />
+                <text key="operator" text="Operator" />
             </optional>
         </item> <!-- Tree Row -->
         <item name="Wood" icon="presets/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">