Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 1174)
+++ trunk/presets/presets.xml	(revision 1175)
@@ -2793,4 +2793,10 @@
 		</item>
 
+		<item name="Cave Entrance" icon="presets/empty.png">
+			<label text="Edit Cave Entrance" />
+			<key key="natural" value="cave_entrance" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
 		<item name="Peak" icon="presets/peak.png">
 			<label text="Edit Peak" />
@@ -2814,4 +2820,74 @@
 		</item>
 
+		<item name="Scree" icon="presets/empty.png">
+			<label text="Edit Scree" />
+			<key key="natural" value="scree" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Scrub" icon="presets/empty.png">
+			<label text="Edit Scrub" />
+			<key key="natural" value="scrub" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Fell" icon="presets/empty.png">
+			<label text="Edit Fell" />
+			<key key="natural" value="fell" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Heath" icon="presets/empty.png">
+			<label text="Edit Heath" />
+			<key key="natural" value="heath" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Wood" icon="presets/empty.png">
+			<label text="Edit Wood" />
+			<key key="natural" value="wood" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
+		</item>
+
+		<separator/>
+
+		<item name="Riverbank" icon="presets/waterway.png">
+			<label text="Edit a riverbank" />
+			<key key="waterway" value="riverbank" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Coastline" icon="presets/empty.png">
+			<label text="Edit Coastline" />
+			<key key="natural" value="coastline" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Wetland" icon="presets/empty.png">
+			<label text="Edit Wetland" />
+			<key key="natural" value="wetland" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Mud" icon="presets/empty.png">
+			<label text="Edit Mud" />
+			<key key="natural" value="mud" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Beach" icon="presets/empty.png">
+			<label text="Edit Beach" />
+			<key key="natural" value="beach" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Bay" icon="presets/empty.png">
+			<label text="Edit Bay" />
+			<key key="natural" value="bay" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
 		<item name="Cliff" icon="presets/empty.png">
 			<label text="Edit Cliff" />
@@ -2820,71 +2896,4 @@
 		</item>
 
-		<item name="Scree" icon="presets/empty.png">
-			<label text="Edit Scree" />
-			<key key="natural" value="scree" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Scrub" icon="presets/empty.png">
-			<label text="Edit Scrub" />
-			<key key="natural" value="scrub" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Fell" icon="presets/empty.png">
-			<label text="Edit Fell" />
-			<key key="natural" value="fell" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Heath" icon="presets/empty.png">
-			<label text="Edit Heath" />
-			<key key="natural" value="heath" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Wood" icon="presets/empty.png">
-			<label text="Edit Wood" />
-			<key key="natural" value="wood" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Wetland" icon="presets/empty.png">
-			<label text="Edit Wetland" />
-			<key key="natural" value="wetland" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Coastline" icon="presets/empty.png">
-			<label text="Edit Coastline" />
-			<key key="natural" value="coastline" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Mud" icon="presets/empty.png">
-			<label text="Edit Mud" />
-			<key key="natural" value="mud" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Beach" icon="presets/empty.png">
-			<label text="Edit Beach" />
-			<key key="natural" value="beach" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Bay" icon="presets/empty.png">
-			<label text="Edit Bay" />
-			<key key="natural" value="bay" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Cave Entrance" icon="presets/empty.png">
-			<label text="Edit Cave Entrance" />
-			<key key="natural" value="cave_entrance" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
 	</group> <!-- Natural -->