Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 3609)
+++ trunk/styles/standard/elemstyles.xml	(revision 3611)
@@ -1701,4 +1701,12 @@
 
 	<rule>
+		<condition k="man_made" v="chimney"/>
+		<icon annotate="true" src="misc/landmark/chimney.png"/>
+		<area colour="manmade#d8d8d8"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="man_made" v="crane"/>
 		<area colour="manmade#d8d8d8"/>
@@ -1725,6 +1733,22 @@
 
 	<rule>
+		<condition k="man_made" v="groyne"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<area colour="manmade#d8d8d8"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="man_made" v="lighthouse"/>
 		<icon annotate="true" src="misc/landmark/lighthouse.png"/>
+		<area colour="manmade#d8d8d8"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="man_made" v="mineshaft"/>
+		<icon annotate="true" src="misc/landmark/mine.png"/>
 		<area colour="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
@@ -1982,4 +2006,12 @@
 	</rule>
 
+	<rule>
+		<condition k="leisure" v="sauna"/>
+		<icon annotate="true" src="leisure/sauna.png"/>
+		<area colour="leisure#c7f1a3"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
 <!--amenity tags -->
 
@@ -2416,4 +2448,12 @@
 
 	<rule>
+		<condition k="amenity" v="studio"/>
+		<icon annotate="true" src="service/studio.png"/>
+		<area colour="amenity_light#f7efb7"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="amenity" v="school"/>
 		<icon annotate="true" src="education/school.png"/>
@@ -2793,4 +2833,12 @@
 
 	<rule>
+		<condition k="shop" v="boutique"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="car"/>
 		<icon annotate="true" src="transport/car.png"/>
@@ -2849,4 +2897,28 @@
 
 	<rule>
+		<condition k="shop" v="confectionery"/>
+		<icon annotate="true" src="shop/groceries/confectionery.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="copyshop"/>
+		<icon annotate="true" src="shop/copyshop.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="curtain"/>
+		<icon annotate="true" src="shop/curtain.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="cycle_repair"/>
 		<icon annotate="true" src="sport/bicycle.png"/>
@@ -2865,4 +2937,12 @@
 
 	<rule>
+		<condition k="shop" v="deli"/>
+		<icon annotate="true" src="shop/groceries/deli.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="electronics"/>
 		<icon annotate="true" src="shop/electronics.png"/>
@@ -2873,4 +2953,12 @@
 
 	<rule>
+		<condition k="shop" v="erotic"/>
+		<icon annotate="true" src="shop/erotic.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="furniture"/>
 		<icon annotate="true" src="shop/furniture.png"/>
@@ -2881,4 +2969,12 @@
 
 	<rule>
+		<condition k="shop" v="fabric"/>
+		<icon annotate="true" src="shop/fabric.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="florist"/>
 		<icon annotate="true" src="shop/florist.png"/>
@@ -2889,7 +2985,24 @@
 
 	<rule>
+		<condition k="shop" v="frame"/>
+		<icon annotate="true" src="shop/frame.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="greengrocer"/>
+		<icon annotate="true" src="shop/groceries/greengrocer.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+        <!-- superseeded by greengrocer -->
 		<condition k="shop" v="groceries"/>
-		<icon annotate="true" src="shop/groceries/fruits.png"/>
-		<area colour="shop#00005f"/>
+		<icon annotate="true" src="misc/deprecated.png"/>
+		<area colour="deprecated#ff0000"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2914,5 +3027,13 @@
 	<rule>
 		<condition k="shop" v="hardware"/>
-		<icon annotate="true" src="shop/diy_store.png"/>
+		<icon annotate="true" src="shop/hardware.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="hearing_aids"/>
+		<icon annotate="true" src="shop/hearing_aids.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>
@@ -2937,4 +3058,12 @@
 
 	<rule>
+		<condition k="shop" v="kitchen"/>
+		<icon annotate="true" src="shop/kitchen.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="mall"/>
 		<icon annotate="true" src="shop/mall.png"/>
@@ -2945,4 +3074,12 @@
 
 	<rule>
+		<condition k="shop" v="mobile_phone"/>
+		<icon annotate="true" src="shop/mobile_phone.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="motorcycle"/>
 		<icon annotate="true" src="vehicle/motorbike.png"/>
@@ -2953,4 +3090,12 @@
 
 	<rule>
+		<condition k="shop" v="musical_instrument"/>
+		<icon annotate="true" src="shop/musical_instrument.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="newsagent"/>
 		<icon annotate="true" src="shop/kiosk.png"/>
@@ -2977,4 +3122,20 @@
 
 	<rule>
+		<condition k="shop" v="paint"/>
+		<icon annotate="true" src="shop/paint.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="seafood"/>
+		<icon annotate="true" src="shop/groceries/seafood.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="shoes"/>
 		<icon annotate="true" src="shop/shoes.png"/>
@@ -3019,4 +3180,20 @@
 		<condition k="shop" v="toys"/>
 		<icon annotate="true" src="shop/toys.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="vacuum_cleaner"/>
+		<icon annotate="true" src="shop/vacuum_cleaner.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="variety_store"/>
+		<icon annotate="true" src="shop/variety_store.png"/>
 		<area colour="shop#00005f"/>
 		<scale_min>1</scale_min>