Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 1126)
+++ /trunk/styles/standard/elemstyles.xml	(revision 1127)
@@ -302,4 +302,40 @@
 	</rule>
 	<rule>
+		<condition k="barrier" v="hedge"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="barrier" v="stile"/>
+		<icon annotate="true" src="vehicle/stile.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="barrier" v="fence"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="barrier" v="wood_fence"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="barrier" v="wire_fence"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
+		<condition k="barrier" v="cycle_barrier"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	<rule>
 		<condition k="barrier"/>
 		<icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
@@ -532,11 +568,4 @@
 		<condition k="highway" v="gate"/>
 		<icon annotate="true" src="vehicle/gate.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="highway" v="stile"/>
-		<icon annotate="true" src="vehicle/stile.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1985,12 +2014,4 @@
 
 	<rule>
-		<condition k="amenity" v="park_bench"/>
-		<area colour="amenity2#f7efb7"/>
-		<icon annotate="true" src="recreation/bench.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="amenity" v="bench"/>
 		<area colour="amenity2#f7efb7"/>
@@ -2032,4 +2053,11 @@
 	</rule>
 
+	<rule>
+		<condition k="amenity" v="signpost"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>40000</scale_max>
+	</rule>
+
 <!--shop tags -->
 
@@ -3635,4 +3663,5 @@
 <!--"deprecated" tags -->
 
+	<!-- historic=museum -> tourism=museum -->
 	<rule>
 		<condition k="historic" v="museum"/>
@@ -3643,4 +3672,5 @@
 	</rule>
 
+	<!-- man_made=power_wind -> power=generator and power_source=wind -->
 	<rule>
 		<condition k="man_made" v="power_wind"/>
@@ -3651,4 +3681,5 @@
 	</rule>
 
+	<!-- man_made=power_hydro -> power=generator and power_source=hydro -->
 	<rule>
 		<condition k="man_made" v="power_hydro"/>
@@ -3659,4 +3690,5 @@
 	</rule>
 
+	<!-- man_made=power_fossil -> power=generator and power_source=fossil -->
 	<rule>
 		<condition k="man_made" v="power_fossil"/>
@@ -3667,4 +3699,5 @@
 	</rule>
 
+	<!-- man_made=power_nuclear -> power=generator and power_source=nuclear -->
 	<rule>
 		<condition k="man_made" v="power_nuclear"/>
@@ -3675,4 +3708,5 @@
 	</rule>
 
+	<!-- highway classification now more detailed -->
 	<rule>
 		<condition k="highway" v="minor"/>
@@ -3683,4 +3717,21 @@
 	</rule>
 
+	<!-- amenity=park_bench -> amenity=bench -->
+	<rule>
+		<condition k="amenity" v="park_bench"/>
+		<area colour="deprecated#ff0000"/>
+		<icon annotate="true" src="misc/deprecated.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<!-- highway=stile -> barrier=stile -->
+	<rule>
+		<condition k="highway" v="stile"/>
+		<icon annotate="true" src="misc/deprecated.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
 	<!-- there's a bit confusion about this tag, the proposal says leisure, map features say tourism ?!? -->
 	<rule>