Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 921)
+++ trunk/presets/presets.xml	(revision 922)
@@ -210,12 +210,12 @@
 		</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=" " />
+		<item name="Service" icon="presets/way_unclassified.png">
+			<label text="Edit a Serviceway" />
+			<label text=" " />
+			<key key="highway" value="service" />
+			<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" />
@@ -225,5 +225,18 @@
 			<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" />
+			<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="Parking Aisle" icon="presets/way_unclassified.png">
+			<label text="Edit a Parking Aisle" />
+			<label text=" " />
+			<key key="highway" value="service" />
+			<key key="service" value="parking_aisle" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
+			<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
 		</item>
 
@@ -310,54 +323,4 @@
 
 	<group name="Ways" icon="presets/way_unclassified.png">
-		<item name="Service" icon="presets/way_unclassified.png">
-			<label text="Edit a Serviceway" />
-			<label text=" " />
-			<key key="highway" value="service" />
-			<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" />
-			<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" 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="Parking Aisle" icon="presets/way_unclassified.png">
-			<label text="Edit a Parking Aisle" />
-			<label text=" " />
-			<key key="highway" value="service" />
-			<key key="service" value="parking_aisle" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
-			<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Bus Guideway" icon="presets/busway.png">
-			<label text="Edit a Bus Guideway" />
-			<label text=" " />
-			<key key="highway" value="bus_guideway" />
-			<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" />
-			<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" 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="Construction" icon="presets/construction.png">
 			<label text="Edit a highway under construction" />
@@ -436,4 +399,22 @@
 			<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" 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="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>
@@ -789,5 +770,5 @@
 		</item>
 
-		<item name="Speed Camera" icon="presets/waypoints.png">
+		<item name="Speed Camera" icon="presets/speed_camera.png">
 			<key key="amenity" value="speed_camera" />
 		</item>
@@ -839,4 +820,25 @@
 		</item>
 
+		<item name="Bus Guideway" icon="presets/busway.png">
+			<label text="Edit a Bus Guideway" />
+			<label text=" " />
+			<key key="highway" value="bus_guideway" />
+			<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" />
+			<combo key="surface" text="Surface" values="paved,unpaved,cobblestone" 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>
+
+		<separator/>
+
 		<item name="Preserved" icon="presets/rail_preserved.png">
 			<label text="Edit a Preserved Railway" />
@@ -845,6 +847,4 @@
 			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 		</item>
-
-		<separator/>
 
 		<item name="Disused Rail" icon="presets/railway.png">
@@ -963,5 +963,5 @@
 		</item>
 
-		<item name="Marina" icon="presets/empty.png">
+		<item name="Marina" icon="styles/standard/nautical/marina.png">
 			<label text="Edit Marina" />
 			<key key="leisure" value="marina" />
@@ -1080,18 +1080,18 @@
 		</item>
 		
+		<item name="Subway Entrance" icon="styles/standard/transport/underground.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="Tram Stop" icon="presets/tram.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="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:" />
@@ -1302,7 +1302,13 @@
 
 	<group name="Leisure" icon="presets/kindergarten.png">
-		<item name="Water Park" icon="presets/empty.png">
+		<item name="Water Park" icon="styles/standard/recreation/water_park.png">
 			<label text="Edit Water Park" />
 			<key key="leisure" value="water_park" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Playground" icon="presets/playground.png">
+			<label text="Edit Playground" />
+			<key key="leisure" value="playground" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
@@ -1323,10 +1329,4 @@
 			<label text="Edit Park" />
 			<key key="leisure" value="park" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Playground" icon="presets/playground.png">
-			<label text="Edit Playground" />
-			<key key="leisure" value="playground" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
@@ -1386,7 +1386,19 @@
 			<combo key="sport" text="sport" values="multi,archery,athletics,australian_football,baseball,basketball,boules,bowls,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
 		</item>
+		
+		<item name="Golf Course" icon="styles/standard/sports/golf.png">
+			<label text="Edit Golf Course" />
+			<key key="leisure" value="golf_course" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Miniature Golf" icon="styles/standard/sports/golf.png">
+			<label text="Edit Miniature Golf" />
+			<key key="leisure" value="miniature_golf" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
 	</group>
 	
-	<group name="Sport" icon="presets/soccer.png">
+	<group name="Sport" icon="presets/canoe.png">
 		<item name="Multi" icon="presets/empty.png">
 			<label text="Edit Multi" />
@@ -1501,5 +1513,5 @@
 		</item>
 		
-		<item name="Shooting" icon="presets/empty.png">
+		<item name="Shooting" icon="styles/standard/misc/landmark/range.png">
 			<label text="Edit Shooting" />
 			<key key="sport" value="shooting" />
@@ -1525,5 +1537,5 @@
 		</item>
 		
-		<item name="Australian Football" icon="presets/empty.png">
+		<item name="Australian Football" icon="presets/football.png">
 			<label text="Edit Australian Football" />
 			<key key="sport" value="australian_football" />
@@ -1532,5 +1544,5 @@
 		</item>
 		
-		<item name="Baseball" icon="presets/empty.png">
+		<item name="Baseball" icon="styles/standard/sports/baseball.png">
 			<label text="Edit Baseball" />
 			<key key="sport" value="baseball" />
@@ -1567,5 +1579,5 @@
 		</item>
 		
-		<item name="Cricket" icon="presets/empty.png">
+		<item name="Cricket" icon="styles/standard/sports/cricket.png">
 			<label text="Edit Cricket" />
 			<key key="sport" value="cricket" />
@@ -1689,5 +1701,5 @@
 		</item>
 
-		<item name="Police" icon="presets/police.png">
+		<item name="Police" icon="styles/standard/public/police.png">
 			<label text="Edit Police" />
 			<key key="amenity" value="police" />
@@ -2056,5 +2068,5 @@
 		</item>
 
-		<item name="Quarry" icon="presets/landuse.png">
+		<item name="Quarry" icon="styles/standard/misc/landmark/mine.png">
 			<label text="Edit Quarry Landuse" />
 			<label text=" " />
@@ -2120,5 +2132,5 @@
 		</item>
 
-		<item name="Industrial" icon="presets/landuse.png">
+		<item name="Industrial" icon="presets/works.png">
 			<label text="Edit Industrial Landuse" />
 			<label text=" " />
@@ -2141,5 +2153,5 @@
 		</item>
 
-		<item name="Railway land" icon="presets/landuse.png">
+		<item name="Railway land" icon="presets/rail_light.png">
 			<label text="Edit Railway Landuse" />
 			<label text=" " />
@@ -2148,5 +2160,5 @@
 		</item>
 
-		<item name="Construction area" icon="presets/landuse.png">
+		<item name="Construction area" icon="presets/construction.png">
 			<label text="Edit Construction Landuse" />
 			<label text=" " />
@@ -2155,5 +2167,5 @@
 		</item>
 
-		<item name="Military" icon="presets/landuse.png">
+		<item name="Military" icon="presets/military.png">
 			<label text="Edit Military Landuse" />
 			<label text=" " />