Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 903)
+++ /trunk/presets/presets.xml	(revision 904)
@@ -165,4 +165,78 @@
 		</item>
 
+		<item name="Unclassified" icon="presets/way_unclassified.png">
+			<label text="Edit a Unclassified Road" />
+			<label text=" " />
+			<key key="highway" value="unclassified" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+			<check key="embankment" text="Embankment" default="off" 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" />
+			<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Residential" icon="presets/residential.png">
+			<label text="Edit a Residential Street" />
+			<label text=" " />
+			<key key="highway" value="residential" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+			<check key="embankment" text="Embankment" default="off" 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" />
+			<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Living Street" icon="presets/living_street.png">
+			<label text="Edit a Living Street" />
+			<label text=" " />
+			<key key="highway" value="living_street" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+			<check key="embankment" text="Embankment" default="off" 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" />
+			<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Pedestrian" icon="presets/pedestrian.png">
+			<label text="Edit a Pedestrian Street" />
+			<label text=" " />
+			<key key="highway" value="pedestrian" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+			<check key="embankment" text="Embankment" default="off" 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" />
+			<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
+			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+		</item>
+
+		<separator/>
+
 		<item name="Road (Unknown Type)" icon="presets/way_unknown.png">
 			<label text="Edit a Road of unknown type" />
@@ -183,79 +257,7 @@
 		</item>
 
-
-		<item name="Unclassified" icon="presets/way_unclassified.png">
-			<label text="Edit a Unclassified Road" />
-			<label text=" " />
-			<key key="highway" value="unclassified" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-			<check key="embankment" text="Embankment" default="off" 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" />
-			<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
-			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Residential" icon="presets/residential.png">
-			<label text="Edit a Residential Street" />
-			<label text=" " />
-			<key key="highway" value="residential" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-			<check key="embankment" text="Embankment" default="off" 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" />
-			<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Living Street" icon="presets/living_street.png">
-			<label text="Edit a Living Street" />
-			<label text=" " />
-			<key key="highway" value="living_street" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-			<check key="embankment" text="Embankment" default="off" 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" />
-			<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Pedestrian" icon="presets/pedestrian.png">
-			<label text="Edit a Pedestrian Street" />
-			<label text=" " />
-			<key key="highway" value="pedestrian" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-			<check key="embankment" text="Embankment" default="off" 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" />
-			<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
-		</item>
-
 		<separator/>
 
+		
 		<item name="Road Restrictions" icon="presets/restrictions.png">
 			<label text="Edit Road Restrictions" />
@@ -347,14 +349,4 @@
 		</item>
 
-		<item name="Ferry" 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>
-
 		<item name="Bus Guideway" icon="presets/busway.png">
 			<label text="Edit a Bus Guideway" />
@@ -912,4 +904,16 @@
 		<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" />
@@ -1128,5 +1132,5 @@
 		</item>
 
-		<item name="Pub" icon="presets/empty.png">
+		<item name="Pub" icon="presets/pub.png">
 			<label text="Edit Pub" />
 			<key key="amenity" value="pub" />
@@ -1172,5 +1176,5 @@
 		</item>
 
-		<item name="Attraction" icon="presets/empty.png">
+		<item name="Attraction" icon="presets/sightseeing.png">
 			<label text="Edit Attraction" />
 			<key key="tourism" value="attraction" />