Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 820)
+++ trunk/presets/presets.xml	(revision 821)
@@ -765,5 +765,145 @@
 	</item>
 
-	<item name="Waypoints/Bus Stop" icon="presets/bus.png">
+	<item name="Waypoints/Stop" icon="presets/Stop.png">
+		<key key="highway" value="stop" />
+	</item>
+
+	<item name="Waypoints/Cattle Grid" icon="presets/waypoints.png">
+		<key key="highway" value="cattle_grid" />
+	</item>
+
+	<item name="Waypoints/Stile" icon="presets/waypoints.png">
+		<key key="highway" value="stile" />
+	</item>
+
+	<item name="Waypoints/Mountain Pass" icon="presets/waypoints.png">
+		<label text="Edit Mountain Pass" />
+		<label text=" " />
+		<key key="highway" value="mountain_pass" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+	</item>
+	
+	
+	<item name="Railway/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="Railway/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="Railway/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="Railway/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="Railway/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="Railway/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="Railway/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="Railway/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="Railway/Abandoned Rail" icon="presets/railway.png">
+		<key key="railway" value="abandoned"/>
+	</item>
+	
+	<item name="Railway/ " icon="presets/empty.png"></item>
+
+	<item name="Railway Point/Crossing" icon="presets/railwaypoint.png">
+		<key key="railway" value="crossing" />
+	</item>
+
+	<item name="Railway Point/Level Crossing" icon="presets/railwaypoint.png">
+		<key key="railway" value="level_crossing" />
+	</item>
+
+	<item name="Railway Point/Turntable" icon="presets/railwaypoint.png">
+		<key key="railway" value="turntable" />
+	</item>
+
+
+
+
+	<item name="Public Transport/Station" icon="presets/railwaypoint.png">
+		<label text="Edit Station" />
+		<label text=" " />
+		<key key="railway" value="station" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+	</item>
+	
+	<item name="Public Transport/Halt" icon="presets/railwaypoint.png">
+		<label text="Edit Halt" />
+		<label text=" " />
+		<key key="railway" value="halt" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+	</item>
+	
+	<item name="Public Transport/Tram Stop" icon="presets/railwaypoint.png">
+		<label text="Edit Tram Stop" />
+		<label text=" " />
+		<key key="railway" value="tram_stop" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+	</item>
+	
+	<item name="Public Transport/Subway Entrance" icon="presets/railwaypoint.png">
+		<label text="Edit Subway Entrance" />
+		<label text=" " />
+		<key key="railway" value="subway_entrance" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+	</item>
+
+	<item name="Public Transport/Bus Stop" icon="presets/bus.png">
 		<label text="Edit Bus Stop" />
 		<label text=" " />
@@ -774,6 +914,6 @@
 		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
-
-	<item name="Waypoints/Bus Station" icon="presets/bus.png">
+	
+	<item name="Public Transport/Bus Station" icon="presets/bus.png">
 		<label text="Edit a Bus Station" />
 		<key key="amenity" value="bus_station" />
@@ -784,142 +924,4 @@
 	</item>
 
-
-	<item name="Waypoints/Stop" icon="presets/Stop.png">
-		<key key="highway" value="stop" />
-	</item>
-
-	<item name="Waypoints/Cattle Grid" icon="presets/waypoints.png">
-		<key key="highway" value="cattle_grid" />
-	</item>
-
-	<item name="Waypoints/Stile" icon="presets/waypoints.png">
-		<key key="highway" value="stile" />
-	</item>
-
-	<item name="Waypoints/Mountain Pass" icon="presets/waypoints.png">
-		<label text="Edit Mountain Pass" />
-		<label text=" " />
-		<key key="highway" value="mountain_pass" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="name" text="Name" default="" delete_if_empty="true" />
-	</item>
-	
-	
-	<item name="Railway/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="Railway/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="Railway/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="Railway/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="Railway/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="Railway/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="Railway/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="Railway/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="Railway/Abandoned Rail" icon="presets/railway.png">
-		<key key="railway" value="abandoned"/>
-	</item>
-	
-	<item name="Railway/ " icon="presets/empty.png"></item>
-
-
-	<item name="Railway Point/Station" icon="presets/railwaypoint.png">
-		<label text="Edit Station" />
-		<label text=" " />
-		<key key="railway" value="station" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="name" text="Name" default="" delete_if_empty="true" />
-	</item>
-
-	<item name="Railway Point/Halt" icon="presets/railwaypoint.png">
-		<label text="Edit Halt" />
-		<label text=" " />
-		<key key="railway" value="halt" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="name" text="Name" default="" delete_if_empty="true" />
-	</item>
-
-	<item name="Railway Point/Tram Stop" icon="presets/railwaypoint.png">
-		<label text="Edit Tram Stop" />
-		<label text=" " />
-		<key key="railway" value="tram_stop" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="name" text="Name" default="" delete_if_empty="true" />
-	</item>
-
-	<item name="Railway Point/Subway Entrance" icon="presets/railwaypoint.png">
-		<label text="Edit Subway Entrance" />
-		<label text=" " />
-		<key key="railway" value="subway_entrance" />
-		<label text=" " />
-		<label text="Optional Attributes:" />
-		<label text=" " />
-		<text key="name" text="Name" default="" delete_if_empty="true" />
-	</item>
-
-	<item name="Railway Point/Crossing" icon="presets/railwaypoint.png">
-		<key key="railway" value="crossing" />
-	</item>
-
-	<item name="Railway Point/Level Crossing" icon="presets/railwaypoint.png">
-		<key key="railway" value="level_crossing" />
-	</item>
-
-	<item name="Railway Point/Turntable" icon="presets/railwaypoint.png">
-		<key key="railway" value="turntable" />
-	</item>