Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 8145)
+++ trunk/data/defaultpresets.xml	(revision 8146)
@@ -309,4 +309,22 @@
         </optional>
     </chunk>
+    <chunk id="waterway">
+        <reference ref="name_layer" />
+        <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
+        <combo key="tunnel" text="Tunnel" values="culvert,yes" />
+        <text key="width" text="Width (meters)" />
+    </chunk>
+    <chunk id="waterway_wikipedia">
+        <reference ref="waterway" />
+        <text key="wikipedia" text="Wikipedia" />
+    </chunk>
+    <chunk id="water_access">
+        <optional text="Water access rules:">
+            <combo key="ship" text="Ship" values="yes,designated,destination,delivery,permissive,private,no" />
+            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
+            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
+            <combo key="canoe" text="Canoe" values="yes,designated,destination,delivery,permissive,private,no" />
+        </optional>
+    </chunk>
   <!-- Link chunks -->
   <chunk id="link_contact_address">
@@ -1675,7 +1693,7 @@
             <space />
             <key key="waterway" value="drain" />
-            <text key="name" text="Name" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
+            <optional>
+                <reference ref="waterway" />
+            </optional>
         </item> <!-- Drain -->
         <item name="Ditch" icon="presets/waterway.png" type="way" preset_name_label="true">
@@ -1687,7 +1705,7 @@
             <space />
             <key key="waterway" value="ditch" />
-            <text key="name" text="Name" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
+            <optional>
+                <reference ref="waterway" />
+            </optional>
         </item> <!-- Ditch -->
         <item name="Stream" icon="presets/waterway.png" type="way" preset_name_label="true">
@@ -1704,25 +1722,9 @@
             <space />
             <key key="waterway" value="stream" />
-            <text key="name" text="Name" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
-            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
-            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
+            <optional>
+                <reference ref="waterway_wikipedia" />
+            </optional>
+            <reference ref="water_access" />
         </item> <!-- Stream -->
-        <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=canal"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=canal"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=canal"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=canal"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=canal"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=canal" />
-            <space />
-            <key key="waterway" value="canal" />
-            <reference ref="name_wikipedia" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
-            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
-        </item> <!-- Canal -->
         <item name="River" icon="presets/river.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
@@ -1737,10 +1739,27 @@
             <space />
             <key key="waterway" value="river" />
-            <reference ref="name_wikipedia" />
-            <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
-            <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
-            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
-            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
+            <optional>
+                <reference ref="waterway_wikipedia" />
+            </optional>
+            <reference ref="water_access" />
         </item> <!-- River -->
+        <item name="Canal" icon="presets/waterway.png" type="way" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=canal"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:waterway=canal"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:waterway=canal"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:waterway=canal"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:waterway=canal"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:waterway=canal" />
+            <space />
+            <key key="waterway" value="canal" />
+            <optional>
+                <reference ref="name_layer" />
+                <combo key="tunnel" text="Tunnel" values="culvert,yes" />
+                <text key="width" text="Width (meters)" />
+                <text key="wikipedia" text="Wikipedia" />
+            </optional>
+            <reference ref="water_access" />
+        </item> <!-- Canal -->
         <separator/>
         <item name="Spring" icon="presets/spring.png" type="node,closedway" preset_name_label="true">
@@ -1872,6 +1891,6 @@
             <check key="salt" text="Salt Water" disable_off="true" />
             <check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
-            <combo key="boat" text="Boat" values="yes,designated,destination,delivery,permissive,private,no" />
-            <combo key="motorboat" text="Motorboat" values="yes,designated,destination,delivery,permissive,private,no" />
+            <text key="wikipedia" text="Wikipedia" />
+            <reference ref="water_access" />
         </item> <!-- Water -->
         <item name="Coastline" icon="presets/coastline.png" type="way,closedway,relation" preset_name_label="true">