Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 728)
+++ trunk/presets/presets.xml	(revision 790)
@@ -7,6 +7,31 @@
 
 <annotations>
-	
-	
+
+	<item name="Streets" icon="presets/way_unknown.png"/>
+	<item name="Ways" icon="presets/way_unknown.png"/>
+	<item name="Railway" icon="presets/railway.png"/>
+	<item name="Waterway" icon="presets/waterway.png"/>
+	<item name=" " icon="presets/empty.png"/>
+	<item name="Car" icon="presets/car.png"/>
+	<item name="Bicycle" icon="presets/bike.png"/>
+	<item name=" " icon="presets/empty.png"/>
+	<item name="Accomodation" icon="presets/bed.png"/>
+	<item name="Food+Drinks" icon="presets/restaurant.png"/>
+	<item name="Tourism" icon="presets/State_Public.png"/>
+	<item name="Historic Places" icon="presets/State_Tourist.png"/>
+	<item name="Leisure" icon="presets/kindergarten.png"/>
+	<item name="Sport" icon="presets/soccer.png"/>
+	<item name=" " icon="presets/empty.png"/>
+	<item name="Buildings" icon="presets/townhall.png"/>
+	<item name="Amenities" icon="presets/telephone.png"/>
+	<item name="Cash" icon="presets/dollar.png"/>
+	<item name="Shops" icon="presets/shopping.png"/>
+	<item name=" " icon="presets/empty.png"/>
+	<item name="Places" icon="presets/places.png"/>
+	<item name="Boundaries" icon="presets/boundaries.png"/>
+	<item name="Landuse" icon="presets/landuse.png"/>
+	<item name="Natural" icon="presets/water.png"/>
+	<item name="Man Made" icon="presets/works.png"/>
+
 	<item name="Streets/Motorway" icon="presets/motorway.png">
 		<label text="Edit a Motorway" />
@@ -264,12 +289,12 @@
 		<check key="toll" text="Toll" default="off" delete_if_empty="true"  />
 		<check key="noexit" text="No exit (cul-de-sac)" default="off" delete_if_empty="true"  />
-		<combo key="access" text="Access" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
 		<combo key="bicycle" text="Bicycle" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true"  />
 		<combo key="foot" text="Foot" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
 		<combo key="goods" text="Goods" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
-		<combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
 		<combo key="horse" text="Horse" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
 		<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
-		<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
 		<combo key="psv" text="Public Service Vehicles (psv)" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
 		<combo key="motorboat" text="Motorboat" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
@@ -502,4 +527,7 @@
 		<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" 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" />
+		<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
 		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
@@ -520,4 +548,7 @@
 		<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" 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" />
+		<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
 		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
@@ -538,4 +569,7 @@
 		<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" 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" />
+		<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
 		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
@@ -556,4 +590,7 @@
 		<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" 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" />
+		<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
 		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
@@ -574,4 +611,7 @@
 		<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" 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" />
+		<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
 		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
@@ -592,4 +632,7 @@
 		<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" 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" />
+		<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+		<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
 		<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 	</item>
@@ -804,6 +847,4 @@
 	
 	
-	<item name=" " icon="presets/empty.png"></item>
-
 	<item name="Car/Fuel" icon="presets/fuel.png">
 		<label text="Edit Fuel" />
@@ -854,5 +895,4 @@
 	</item>
 
-	<item name=" " icon="presets/empty.png"></item>
 
 	<item name="Accomodation/Hotel" icon="presets/bed.png">
@@ -1311,6 +1351,4 @@
 	</item>
 	
-	<item name=" " icon="presets/empty.png"></item>
-
 	<item name="Buildings/Public Building" icon="presets/empty.png">
 		<label text="Edit Public Building" />
@@ -1554,6 +1592,4 @@
 
 
-	<item name=" " icon="presets/empty.png"></item>
-	
 	<item name="Places/Continent" icon="presets/places.png">
 		<label text="Edit a Continent" />