Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 2630)
+++ /trunk/styles/standard/elemstyles.xml	(revision 2631)
@@ -807,12 +807,4 @@
 
 	<rule>
-		<condition k="highway" v="viaduct"/>
-		<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>
-
-	<rule>
 		<condition k="highway" v="motorway_junction"/>
 		<icon annotate="true" src="vehicle/exit.png"/>
@@ -1031,12 +1023,4 @@
 		<condition k="waterway" v="turning_point"/>
 		<icon annotate="true" src="nautical/turning.png"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="waterway" v="aqueduct"/>
-		<line width="2" realwidth="5" dashed="true" colour="aqueduct#ff0000"/>
-		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1139,12 +1123,4 @@
 
 	<rule>
-		<condition k="railway" v="viaduct"/>
-		<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>
-
-	<rule>
 		<condition k="railway" v="crossing"/>
 		<area colour="railwaypoint#f7efb7"/>
@@ -2490,13 +2466,4 @@
 	</rule>
 
-	<rule>
-    <!-- deprecated; use information=guidepost instead -->
-		<condition k="amenity" v="signpost"/>
-    <icon annotate="true" src="misc/deprecated.png"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
-		<scale_min>1</scale_min>
-		<scale_max>40000</scale_max>
-	</rule>
-
 <!--shop tags -->
 
@@ -3406,13 +3373,4 @@
 		<icon src="misc/landmark/trees.png"/>
 		<area colour="woodarea#008000"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="natural" v="marsh"/>
-		<icon src="misc/deprecated.png"/>
-		<line dashed="true" colour="deprecated#ff0000"/>
-		<area colour="deprecated#ff0000"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4294,10 +4252,16 @@
 	<!-- man_made=power_fossil -> power=generator and power_source=fossil -->
 	<!-- man_made=power_nuclear -> power=generator and power_source=nuclear -->
+	<!-- amenity=park_bench -> amenity=bench -->
+	<!-- amenity=signpost -> information=guidepost -->
 	<!-- highway minor - classification now more detailed -->
-	<!-- amenity=park_bench -> amenity=bench -->
 	<!-- highway=stile -> barrier=stile -->
 	<!-- highway=cattle_grid -> barrier=cattle_grid -->
 	<!-- highway=toll_booth -> barrier=toll_booth -->
-
+	<!-- highway=viaduct -> bridge=viaduct -->
+	<!-- railway=viaduct -> bridge=viaduct -->
+	<!-- 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>