--- data/defaultpresets.xml
+++ data/defaultpresets.xml
@@ -1673,16 +1673,18 @@
             <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
         </item>
         <separator/>
-        <item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
+        <item name="Spring" icon="presets/spring.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=spring"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=spring"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=spring"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=spring"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=spring" />
+            <label text="A point where where water flows to the surface of the earth from underground." />
             <space />
             <key key="natural" value="spring" />
             <text key="name" text="Name" />
+            <check key="drinking_water" text="Drinking Water" />
         </item>
         <item name="Waterfall" icon="presets/waterfall.png" type="node,way" preset_name_label="true">
             <space />
@@ -1769,25 +1771,24 @@
             <text key="name" text="Name" />
         </item>
         <separator/>
-        <item name="Water" icon="presets/water.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Water" icon="presets/water.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=water"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=water"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=water"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=water"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=water"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=water"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=water" />
+            <label text="A body of standing water, such as a lake or pond." />
             <space />
             <key key="natural" value="water" />
             <text key="name" text="Name" />
             <combo key="water" text="Water Body" values="lake,lagoon,pond,reservoir" match="key" values_searchable="true" />
+            <check key="salt" text="Salt Water" disable_off="true" />
+            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
         </item>
-        <item name="Land" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
-            <space />
-            <key key="natural" value="land" />
-            <text key="name" text="Name" />
-        </item>
-        <item name="Coastline" icon="presets/coastline.png" type="node,way,closedway,relation" preset_name_label="true">
+        <item name="Coastline" icon="presets/coastline.png" type="way,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=coastline"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=coastline"
@@ -1795,6 +1796,7 @@
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=coastline"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=coastline"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=coastline" />
+            <label text="Line between the sea and land (with the water of on the right side of the way)." />
             <space />
             <key key="natural" value="coastline" />
             <text key="name" text="Name" />
@@ -1815,7 +1817,7 @@
             <text key="name" text="Name" />
         </item>
         <separator/>
-        <item name="Wetland" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Wetland" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=wetland"
@@ -1826,28 +1828,47 @@
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wetland"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wetland" />
+            <label text="Waterlogged area, either permanently or seasonally with vegetation." />
             <space />
             <key key="natural" value="wetland" />
             <text key="name" text="Name" />
             <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" values_searchable="true" />
         </item>
-        <item name="Mud" icon="presets/mud.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Mud" icon="presets/mud.png" type="closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=mud"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=mud"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=mud" />
+            <label text="Large area covered with mud." />
             <key key="natural" value="mud" />
             <space />
             <text key="name" text="Name" />
         </item>
-        <item name="Beach" icon="presets/beach.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Beach" icon="presets/beach.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=beach"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=beach"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=beach"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=beach"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=beach" />
+            <label text="A flat area of sand, gravel or pebble next to water." />
             <space />
             <key key="natural" value="beach" />
-            <text key="name" text="Name" />
+            <reference ref="name_wikipedia" />
+            <optional>
+                <combo key="supervised" text="Supervised" values="yes,no,interval" />
+                <reference ref="oh" />
+                <reference ref="general_access" />
+                <combo key="surface" text="Surface" values="gravel,pebblestone,sand" />
+                <combo key="sport" text="Sport" values="swimming,surfing" />
+            </optional>
         </item>
         <item name="Bay" icon="presets/bay.png" type="node,closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bay"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=bay"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=bay"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=bay"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=bay" />
+            <label text="A large body of water partially enclosed by land but with a wide mouth." />
             <space />
             <key key="natural" value="bay" />
             <text key="name" text="Name" />
@@ -1859,6 +1880,7 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=cliff"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cliff"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=cliff" />
+            <label text="A cliff, a significant vertical, or near vertical, rock exposure (leave the lower face to the right of the way)." />
             <space />
             <key key="natural" value="cliff" />
             <text key="name" text="Name" />
@@ -6329,6 +6351,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=peak"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=peak"
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:natural=peak" />
+            <label text="The top (summit) of a mountain or hill." />
             <space />
             <key key="natural" value="peak" />
             <reference ref="name_wikipedia" />
@@ -6339,6 +6362,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=saddle"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=saddle"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=saddle" />
+            <label text="A saddle point between mountains or hills." />
             <space/>
             <key key="natural" value="saddle" />
             <reference ref="name_wikipedia" />
@@ -6349,30 +6373,40 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=glacier"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:natural=glacier"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=glacier" />
+            <label text="A permanent body of ice formed naturally from snow that is moving under its own weight." />
             <space />
             <key key="natural" value="glacier" />
             <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
         </item>
-        <item name="Volcano" icon="presets/volcano.png" type="node,closedway" preset_name_label="true">
+        <item name="Volcano" icon="presets/volcano.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=volcano"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=volcano"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=volcano"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=volcano" />
+            <label text="A volcano, either dormant, extinct or active." />
             <space />
             <key key="natural" value="volcano" />
             <reference ref="name_wikipedia" />
             <text key="ele" text="Elevation" />
+            <optional>
+                <combo key="volcano:status" text="Current Status" values="active,dormant,extinct" />
+                <combo key="volcano:type" text="Type" values="stratovolcano,shield,scoria" />
+            </optional>
         </item>
         <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=cave_entrance"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=cave_entrance"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=cave_entrance" />
+            <label text="The entrance to a cave." />
             <space />
             <key key="natural" value="cave_entrance" />
             <reference ref="name_wikipedia" />
+            <reference ref="oh" />
+            <reference ref="general_access" />
+            <combo key="fee" text="Fee" values="yes,no" />
         </item>
         <separator/>
         <item name="Island" icon="presets/island.png" type="node,closedway" preset_name_label="true">
@@ -6394,6 +6428,16 @@
             <key key="place" value="islet" />
             <reference ref="name_wikipedia" />
         </item>
+        <item name="Ridge" icon="presets/empty.png" type="way" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=ridge"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=ridge" />
+            <label text="A mountain or hill ridge." />
+            <space />
+            <key key="natural" value="ridge" />
+            <reference ref="name_wikipedia" />
+            <text key="ele" text="Elevation" />
+        </item>
     </group> <!-- Geography -->
     <group name="Nature" icon="presets/tree.png">
         <item name="Tree" icon="presets/tree.png" type="node" preset_name_label="true">
@@ -6406,6 +6450,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=tree"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=tree"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree" />
+            <label text="A single tree." />				  
             <space />
             <key key="natural" value="tree" />
             <text key="name" text="Name" />
@@ -6427,7 +6472,10 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=tree_row"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=tree_row"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=tree_row" />
+            <label text="A line of trees." />				  
+            <space />
             <key key="natural" value="tree_row" />
+            <text key="height" text="Height in meter (m)" />
             <optional>
                 <reference ref="leaf" />
             </optional>
@@ -6439,6 +6487,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=wood"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=wood"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=wood" />
+            <label text="Woodland where timber production does not dominate use." />				  
             <space />
             <key key="natural" value="wood" />
             <text key="name" text="Name" />
@@ -6457,7 +6506,7 @@
             <text key="name" text="Name" />
             <reference ref="leaf" />
         </item>
-        <item name="Grassland" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Grassland" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=grassland"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=grassland"
@@ -6466,6 +6515,7 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=grassland"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=grassland"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=grassland" />
+            <label text="Where vegetation is dominated by grasses (Poaceae) and other herbaceous (non-woody) plants. Excludes cultivated areas and wetlands." />				  				  
             <space />
             <key key="natural" value="grassland" />
             <text key="name" text="Name" />
@@ -6478,6 +6528,13 @@
         </item>
         <separator/>
         <item name="Scree" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scree"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=scree"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=scree"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=scree"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:natural=scree" />
+            <label text="An accumulation of loose rocks." />				  
             <space />
             <key key="natural" value="scree" />
             <text key="name" text="Name" />
@@ -6488,14 +6545,26 @@
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=fell"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=fell"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=fell" />
+            <label text="Bare upper lying uncultivated land principally covered with grass and often grazed." />				  
             <space />
             <key key="natural" value="fell" />
             <text key="name" text="Name" />
         </item>
         <item name="Scrub" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scrub"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scrub"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:natural=scrub"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=scrub"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=scrub"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=scrub"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:natural=scrub" />
+            <label text="Bare lower lying uncultivated land with bushes but little or no tree cover." />				  
             <space />
             <key key="natural" value="scrub" />
             <text key="name" text="Name" />
+            <optional>
+                <reference ref="leaf" />
+            </optional>
         </item>
         <item name="Heath" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
@@ -6504,6 +6573,7 @@
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=heath"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=heath"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=heath" />
+            <label text="Bare lower lying uncultivated land with bushes but little or no tree cover." />				  
             <space />
             <key key="natural" value="heath" />
             <text key="name" text="Name" />
@@ -6512,10 +6582,34 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=sand"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=sand"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:natural=sand" />
+            <label text="Large area covered with sand." />
             <space />
             <key key="natural" value="sand" />
             <text key="name" text="Name" />
         </item>
+        <item name="Bare Rock" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bare_rock"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=bare_rock"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=bare_rock" />
+            <label text="For areas of solid visible rock." />
+            <space />
+            <key key="natural" value="bare_rock" />
+            <text key="name" text="Name" />
+        </item>
+        <item name="Stone" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=stone"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=stone"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:natural=stone"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=stone" />
+            <label text="A single notable free-standing rock, which may differ from the composition of the terrain it lies in." />
+            <space />
+            <key key="natural" value="bare_rock" />
+                <reference ref="name_wikipedia" />
+            <optional>
+                <text key="height" text="Height (meters)" length="7" />
+                <text key="width" text="Width (meters)" />
+            </optional>
+        </item>    
     </group> <!-- Nature -->
     <group name="Land use" icon="presets/landuse.png">
         <item name="Farmyard" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
@@ -6799,7 +6893,7 @@
         </item>
     </group> <!-- Landuse -->
   </group>
-    <group name="Annotation" icon="presets/addresses.png">
+  <group name="Annotation" icon="presets/addresses.png">
         <item name="Name" icon="presets/message.png" type="node,way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:name"
                   ar.href="http://wiki.openstreetmap.org/wiki/Ar:Key:name"
@@ -6905,8 +6999,8 @@
             <text key="wikipedia" text="Wikipedia" />
             <text key="image" text="Image" />
         </item>
-    </group> <!-- Annotation -->
-    <group name="Relations" icon="presets/relations.png">
+  </group> <!-- Annotation -->
+  <group name="Relations" icon="presets/relations.png">
         <item name="Multipolygon" icon="presets/multipolygon.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Relation:multipolygon"
@@ -7010,7 +7104,7 @@
         </item>
         <separator/>
 
-        <group name="Routes">
+    <group name="Routes">
             <item name="Bicycle route" icon="presets/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=bicycle"
                   sk.href="http://wiki.openstreetmap.org/wiki/Sk:Cycle_routes"
@@ -7174,7 +7268,7 @@
                 </roles>
             </item>
 
-        </group> <!-- Routes -->
+    </group> <!-- Routes -->
 
         <item name="Route Network" icon="presets/path.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network" />
@@ -7299,5 +7393,5 @@
                 <role key="edge" text="edge ways parallel to 'through'" requisite="optional" type="way" />
             </roles>
         </item>
-    </group> <!-- Relations -->
+  </group> <!-- Relations -->
 </presets>