Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 2638)
+++ /trunk/styles/standard/elemstyles.xml	(revision 2639)
@@ -786,11 +786,4 @@
 
 	<rule>
-		<condition k="highway" v="gate"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="highway" v="incline"/>
 		<icon annotate="true" src="vehicle/restriction/incline.png"/>
@@ -1851,4 +1844,20 @@
 
 	<rule>
+		<condition k="amenity" v="stripclub"/>
+		<icon annotate="true" src="leisure/stripclub.png"/>
+		<area colour="amenity#ecba52"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="brothel"/>
+		<icon annotate="true" src="leisure/stripclub.png"/>
+		<area colour="amenity#ecba52"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="amenity" v="cafe"/>
 		<icon annotate="true" src="food/cafe.png"/>
@@ -1860,4 +1869,12 @@
 	<rule>
 		<condition k="amenity" v="restaurant"/>
+		<icon annotate="true" src="food/restaurant.png"/>
+		<area colour="amenity#ecba52"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="food_court"/>
 		<icon annotate="true" src="food/restaurant.png"/>
 		<area colour="amenity#ecba52"/>
@@ -4256,4 +4273,5 @@
 	<!-- highway minor - classification now more detailed -->
 	<!-- highway=stile -> barrier=stile -->
+	<!-- highway=gate -> barrier=gate -->
 	<!-- highway=cattle_grid -> barrier=cattle_grid -->
 	<!-- highway=toll_booth -> barrier=toll_booth -->
@@ -4262,15 +4280,5 @@
 	<!-- waterway=aqueduct -> bridge=aqueduct -->
 	<!-- natural=marsh -> natural=wetland -->
-
-	
-	<!-- there's a bit confusion about this tag, the proposal says leisure, map features say tourism ?!? -->
-	<rule>
-		<condition k="leisure" v="zoo"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
+	<!-- leisure=zoo -> tourism=zoo -->
 
 </rules>