Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 910)
+++ trunk/presets/presets.xml	(revision 911)
@@ -79,13 +79,4 @@
 			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
 			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-		</item>
-
-		<item name="Highway Exit" icon="presets/motorway_exit.png">
-			<label text="Edit an Exit" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="ref" text="Exit Number" default="" delete_if_empty="true" />
-			<text key="name" text="Exit Name" default="" delete_if_empty="true" />
 		</item>
 
@@ -719,4 +710,13 @@
 		</item>
 
+		<item name="Highway Exit" icon="presets/motorway_exit.png">
+			<label text="Edit an Exit" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="ref" text="Exit Number" default="" delete_if_empty="true" />
+			<text key="name" text="Exit Name" default="" delete_if_empty="true" />
+		</item>
+
 		<item name="Motorway Junction" icon="presets/motorway_junction.png">
 			<label text="Edit Motorway Junction" />
@@ -772,4 +772,176 @@
 			<label text="Optional Attributes:" />
 			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+	</group> <!-- Waypoints -->
+
+	<separator/>
+
+	<group name="Railway" icon="presets/railway.png">
+		<item name="Rail" icon="presets/railway.png">
+			<label text="Edit a Rail" />
+			<label text=" " />
+			<key key="railway" value="rail"/>
+			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Narrow Gauge Rail" icon="presets/railway.png">
+			<label text="Edit a Narrow Gauge Rail" />
+			<label text=" " />
+			<key key="railway" value="narrow_gauge"/>
+			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Monorail" icon="presets/railway.png">
+			<label text="Edit a Monorail" />
+			<label text=" " />
+			<key key="railway" value="monorail"/>
+			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Light Rail" icon="presets/rail_light.png">
+			<label text="Edit a Light Rail" />
+			<label text=" " />
+			<key key="railway" value="light_rail"/>
+			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Subway" icon="presets/rail_light.png">
+			<label text="Edit a Subway" />
+			<label text=" " />
+			<key key="railway" value="subway"/>
+			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Tram" icon="presets/tram.png">
+			<label text="Edit a Tram" />
+			<label text=" " />
+			<key key="railway" value="tram"/>
+			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Preserved" icon="presets/rail_preserved.png">
+			<label text="Edit a Preserved Railway" />
+			<label text=" " />
+			<key key="railway" value="preserved"/>
+			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Disused Rail" icon="presets/railway.png">
+			<label text="Edit a Disused Railway" />
+			<label text=" " />
+			<key key="railway" value="disused"/>
+			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Abandoned Rail" icon="presets/railway.png">
+			<key key="railway" value="abandoned"/>
+		</item>
+	</group> <!-- Railway -->
+
+	<group name="Railway Point" icon="presets/railwaypoint.png">
+		<item name="Crossing" icon="presets/crossing.png">
+			<key key="railway" value="crossing" />
+		</item>
+
+		<item name="Level Crossing" icon="presets/level_crossing.png">
+			<key key="railway" value="level_crossing" />
+		</item>
+
+		<item name="Turntable" icon="presets/turntable.png">
+			<key key="railway" value="turntable" />
+		</item>
+	</group> <!-- Railway Point -->
+
+	<separator/>
+
+	<group name="Waterway" icon="presets/waterway.png">
+		<item name="River" icon="presets/river.png">
+			<label text="Edit a River" />
+			<label text=" " />
+			<key key="waterway" value="river" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Dock" icon="presets/waterway.png">
+			<label text="Edit a Dock" />
+			<label text=" " />
+			<key key="waterway" value="dock" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Canal" icon="presets/waterway.png">
+			<label text="Edit a Canal" />
+			<label text=" " />
+			<key key="waterway" value="canal" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Drain" icon="presets/waterway.png">
+			<label text="Edit a Drain" />
+			<label text=" " />
+			<key key="waterway" value="drain" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Stream" icon="presets/waterway.png">
+			<label text="Edit a Stream" />
+			<label text=" " />
+			<key key="waterway" value="stream" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		</item>
+
+		<separator/>
+
+		<item name="Ferry Route" icon="presets/ferry.png">
+			<label text="Edit a Ferry" />
+			<label text=" " />
+			<key key="route" value="ferry" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<separator/>
+
+		<item name="Dam" icon="presets/empty.png">
+			<label text="Edit a Dam" />
+			<label text=" " />
+			<key key="waterway" value="dam" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Boatyard" icon="presets/boatyard.png">
+			<label text="Edit a Boatyard" />
+			<label text=" " />
+			<key key="waterway" value="boatyard" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+	</group> <!-- Waterway -->
+
+	<group name="Waterway Point" icon="presets/waterwaypoint.png">
+		<item name="Lock Gate" icon="presets/lock_gate.png">
+			<key key="waterway" value="lock_gate" />
+		</item>
+
+		<item name="Weir" icon="presets/weir.png">
+			<label text="Edit a Weir" />
+			<label text=" " />
+			<key key="waterway" value="weir" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Turning Point" icon="presets/turning.png">
+			<key key="waterway" value="turning_point" />
+		</item>
+
+		<item name="Marina" icon="presets/empty.png">
+			<label text="Edit Marina" />
+			<key key="leisure" value="marina" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
@@ -779,174 +951,4 @@
 			<key key="leisure" value="slipway" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-	</group> <!-- Waypoints -->
-
-	<separator/>
-
-	<group name="Railway" icon="presets/railway.png">
-		<item name="Rail" icon="presets/railway.png">
-			<label text="Edit a Rail" />
-			<label text=" " />
-			<key key="railway" value="rail"/>
-			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Narrow Gauge Rail" icon="presets/railway.png">
-			<label text="Edit a Narrow Gauge Rail" />
-			<label text=" " />
-			<key key="railway" value="narrow_gauge"/>
-			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Monorail" icon="presets/railway.png">
-			<label text="Edit a Monorail" />
-			<label text=" " />
-			<key key="railway" value="monorail"/>
-			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Light Rail" icon="presets/rail_light.png">
-			<label text="Edit a Light Rail" />
-			<label text=" " />
-			<key key="railway" value="light_rail"/>
-			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Subway" icon="presets/rail_light.png">
-			<label text="Edit a Subway" />
-			<label text=" " />
-			<key key="railway" value="subway"/>
-			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Tram" icon="presets/tram.png">
-			<label text="Edit a Tram" />
-			<label text=" " />
-			<key key="railway" value="tram"/>
-			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Preserved" icon="presets/rail_preserved.png">
-			<label text="Edit a Preserved Railway" />
-			<label text=" " />
-			<key key="railway" value="preserved"/>
-			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Disused Rail" icon="presets/railway.png">
-			<label text="Edit a Disused Railway" />
-			<label text=" " />
-			<key key="railway" value="disused"/>
-			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Abandoned Rail" icon="presets/railway.png">
-			<key key="railway" value="abandoned"/>
-		</item>
-	</group> <!-- Railway -->
-
-	<group name="Railway Point" icon="presets/railwaypoint.png">
-		<item name="Crossing" icon="presets/crossing.png">
-			<key key="railway" value="crossing" />
-		</item>
-
-		<item name="Level Crossing" icon="presets/level_crossing.png">
-			<key key="railway" value="level_crossing" />
-		</item>
-
-		<item name="Turntable" icon="presets/turntable.png">
-			<key key="railway" value="turntable" />
-		</item>
-	</group> <!-- Railway Point -->
-
-	<separator/>
-
-	<group name="Waterway" icon="presets/waterway.png">
-		<item name="River" icon="presets/river.png">
-			<label text="Edit a River" />
-			<label text=" " />
-			<key key="waterway" value="river" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Dock" icon="presets/waterway.png">
-			<label text="Edit a Dock" />
-			<label text=" " />
-			<key key="waterway" value="dock" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Canal" icon="presets/waterway.png">
-			<label text="Edit a Canal" />
-			<label text=" " />
-			<key key="waterway" value="canal" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Drain" icon="presets/waterway.png">
-			<label text="Edit a Drain" />
-			<label text=" " />
-			<key key="waterway" value="drain" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Stream" icon="presets/waterway.png">
-			<label text="Edit a Stream" />
-			<label text=" " />
-			<key key="waterway" value="stream" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		</item>
-
-		<separator/>
-
-		<item name="Ferry Route" icon="presets/ferry.png">
-			<label text="Edit a Ferry" />
-			<label text=" " />
-			<key key="route" value="ferry" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<separator/>
-
-		<item name="Weir" icon="presets/weir.png">
-			<label text="Edit a Weir" />
-			<label text=" " />
-			<key key="waterway" value="weir" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Dam" icon="presets/empty.png">
-			<label text="Edit a Dam" />
-			<label text=" " />
-			<key key="waterway" value="dam" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Boatyard" icon="presets/boatyard.png">
-			<label text="Edit a Boatyard" />
-			<label text=" " />
-			<key key="waterway" value="boatyard" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-	</group> <!-- Waterway -->
-
-	<group name="Waterway Point" icon="presets/waterwaypoint.png">
-		<item name="Lock Gate" icon="presets/lock_gate.png">
-			<key key="waterway" value="lock_gate" />
-		</item>
-
-		<item name="Turning Point" icon="presets/turning.png">
-			<key key="waterway" value="turning_point" />
-		</item>
-
-		<item name="Waste Disposal" icon="presets/empty.png">
-			<key key="waterway" value="waste_disposal" />
 		</item>
 	</group> <!-- Waterway -->
@@ -1256,16 +1258,4 @@
 			<label text="Edit Water Park" />
 			<key key="leisure" value="water_park" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Marina" icon="presets/empty.png">
-			<label text="Edit Marina" />
-			<key key="leisure" value="marina" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Slipway" icon="presets/empty.png">
-			<label text="Edit Slipway" />
-			<key key="leisure" value="slipway" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>