Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 1125)
+++ /trunk/presets/presets.xml	(revision 1126)
@@ -746,6 +746,14 @@
 		</item>
 
+		<item name="Signpost">
+			<key key="amenity" value="signpost" />
+		</item>
+		
 		<item name="Speed Camera" icon="presets/speed_camera.png">
 			<key key="highway" value="speed_camera" />
+		</item>
+		
+		<item name="Emergency Phone" icon="presets/telephone.png">
+			<key key="amenity" value="emergency_phone" />
 		</item>
 		
@@ -1106,4 +1114,10 @@
 		</item>
 
+		<item name="Ferry Terminal">
+			<label text="Edit Ferry Terminal" />
+			<key key="amenity" value="ferry_terminal" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
 		<item name="Slipway" icon="presets/slipway.png">
 			<label text="Edit Slipway" />
@@ -1250,4 +1264,12 @@
 			<key key="amenity" value="parking" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="parking" text="Type" values="surface,multi-storey,underground" default="surface" delete_if_empty="true" />
+		</item>
+
+		<item name="Wash" icon="presets/car_wash.png">
+			<label text="Edit Car Wash" />
+			<key key="amenity" value="car_wash" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<text key="operator" text="Operator" default="" delete_if_empty="true" />
 		</item>
 
@@ -1257,5 +1279,5 @@
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 			<text key="operator" text="Operator" default="" delete_if_empty="true" />
-	</item>
+		</item>
 
 		<item name="Rental" icon="presets/car_rental.png">
@@ -1380,4 +1402,12 @@
 		<separator/>
 
+		<item name="Taxi" icon="presets/taxi.png">
+			<label text="Edit a Taxi station" />
+			<key key="amenity" value="taxi" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<separator/>
+
 		<item name="Airport" icon="presets/plane.png">
 			<label text="Edit an airport" />
@@ -1442,4 +1472,5 @@
 			<key key="amenity" value="restaurant" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebap,turkish,asian,thai,mexican,japanese" default="" delete_if_empty="true" />
 		</item>
 
@@ -1448,4 +1479,5 @@
 			<key key="amenity" value="fast_food" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="cuisine" text="Cuisine" values="italian,chinese,pizza,burger,greek,german,indian,regional,kebap,turkish,asian,thai,mexican,japanese" default="" delete_if_empty="true" />
 		</item>
 
@@ -1948,25 +1980,31 @@
 		</item>
 
+		<item name="Embassy">
+			<label text="Edit Embassy" />
+			<key key="amenity" value="embassy" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Courthouse" icon="presets/JusticeScales.png">
+			<label text="Edit Courthouse" />
+			<key key="amenity" value="courthouse" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Prison" icon="presets/prison.png">
+			<label text="Edit Prison" />
+			<key key="amenity" value="prison" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Police" icon="presets/police.png">
+			<label text="Edit Police" />
+			<key key="amenity" value="police" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
 		<item name="Fire Station" icon="presets/firebrigade.png">
 			<label text="Edit Fire Station" />
 			<key key="amenity" value="fire_station" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Courthouse" icon="presets/JusticeScales.png">
-			<label text="Edit Courthouse" />
-			<key key="amenity" value="courthouse" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Prison" icon="presets/prison.png">
-			<label text="Edit Prison" />
-			<key key="amenity" value="prison" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Police" icon="presets/police.png">
-			<label text="Edit Police" />
-			<key key="amenity" value="police" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
@@ -2210,10 +2248,4 @@
 			<check key="lock" text="Lock" default="off" delete_if_empty="true" />
 			<combo key="height" text="Height" values="low,half,full,5,10,15,20" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Taxi" icon="presets/taxi.png">
-			<label text="Edit a Taxi station" />
-			<key key="amenity" value="taxi" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
 
@@ -2338,4 +2370,16 @@
 
 	<group name="Health" icon="presets/pharmacy.png">
+		<item name="Doctors">
+			<label text="Edit Doctors" />
+			<key key="amenity" value="doctors" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Dentist">
+			<label text="Edit Dentist" />
+			<key key="amenity" value="dentist" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
 		<item name="Pharmacy" icon="presets/pharmacy.png">
 			<label text="Edit Pharmacy" />
@@ -2360,4 +2404,11 @@
 			<label text=" " />
 		</item>
+
+		<item name="Veterinary">
+			<label text="Edit Veterinary" />
+			<key key="amenity" value="veterinary" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
 	</group> <!-- Health -->