Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 711)
+++ trunk/styles/standard/elemstyles.xml	(revision 714)
@@ -478,5 +478,5 @@
 	<rule>
 		<condition k="highway" v="construction" />
-		<line width="2" realwidth="5" colour="#FFFF00"/>
+		<line width="2" realwidth="5" colour="#FFFF00" dashed="true"/>
 		<icon src="misc/construction.png" />
         <scale_min>1</scale_min>
@@ -1324,4 +1324,20 @@
 
 	<rule>
+		<condition k="amenity" v="bar" />
+		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#ecba52"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="amenity" v="ice_cream" />
+		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#ecba52"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
 		<condition k="amenity" v="parking" />
 		<icon annotate="true" src="vehicle/parking.png" />
@@ -1364,4 +1380,12 @@
 
 	<rule>
+		<condition k="amenity" v="car_wash" />
+		<area colour="#f7efb7"/>
+		<icon annotate="true" src="misc/proposed.png" />
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
 		<condition k="amenity" v="taxi" />
 		<icon annotate="true" src="transport/taxi.png" />
@@ -1427,4 +1451,12 @@
 	</rule>
 	  	
+	<rule>
+		<condition k="amenity" v="fountain"/>
+		<icon annotate="true" src="misc/landmark/spring.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 	<!--the religion rules must be placed before the place_of_worship rule! -->
 	<rule>
@@ -1515,4 +1547,12 @@
 
 	<rule>
+		<condition k="amenity" v="crematorium" />
+		<area colour="#f7efb7"/>
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="amenity" v="post_office" />
 		<icon annotate="true" src="public/post_office.png" />
@@ -1549,4 +1589,12 @@
 		<condition k="amenity" v="college" />
 		<icon annotate="true" src="education/college.png" />
+		<area colour="#f7efb7"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="kindergarten" />
+		<icon annotate="true" src="misc/proposed.png" />
 		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
@@ -1571,4 +1619,28 @@
 
 	<rule>
+		<condition k="amenity" v="sheltered_housing" />
+        <area colour="#eeeeee" />
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="nursery" />
+        <area colour="#eeeeee" />
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="dentist" />
+        <area colour="#eeeeee" />
+		<icon annotate="true" src="misc/proposed.png" />
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
 		<condition k="amenity" v="library" />
 		<area colour="#f7efb7"/>
@@ -1667,11 +1739,19 @@
 
 	<rule>
-		<condition k="amenity" v="fountain"/>
-		<icon annotate="true" src="misc/landmark/spring.png" />
-		<area colour="#00005f"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
+		<condition k="amenity" v="park_bench" />
+		<area colour="#f7efb7"/>
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="shelter" />
+		<area colour="#f7efb7"/>
+		<icon annotate="true" src="misc/proposed.png" />
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	
 <!--shop tags -->
 
@@ -2066,5 +2146,5 @@
 	<rule>
 		<condition k="landuse" v="construction"/>
-		<area colour="#FFFF00"/>
+		<area colour="#FFFF00" dashed="true"/>
 		<icon src="misc/construction.png" />
         <scale_min>1</scale_min>
@@ -2803,84 +2883,4 @@
 
 <!--"work in progress" tags -->
-	<rule>
-		<condition k="amenity" v="bar" />
-		<icon annotate="true" src="misc/proposed.png" />
-		<area colour="#ecba52"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-	
-	<rule>
-		<condition k="amenity" v="crematorium" />
-		<area colour="#f7efb7"/>
-		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="amenity" v="kindergarten" />
-		<icon annotate="true" src="misc/proposed.png" />
-		<area colour="#f7efb7"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="amenity" v="park_bench" />
-		<area colour="#f7efb7"/>
-		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="amenity" v="sheltered_housing" />
-        <area colour="#eeeeee" />
-		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="amenity" v="nursery" />
-        <area colour="#eeeeee" />
-		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="amenity" v="shelter" />
-		<area colour="#f7efb7"/>
-		<icon annotate="true" src="misc/proposed.png" />
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-	
-	<rule>
-		<condition k="amenity" v="car_wash" />
-		<area colour="#f7efb7"/>
-		<icon annotate="true" src="misc/proposed.png" />
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-	
-	<rule>
-		<condition k="amenity" v="dentist" />
-        <area colour="#eeeeee" />
-		<icon annotate="true" src="misc/proposed.png" />
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-	
-	<rule>
-		<condition k="amenity" v="ice_cream" />
-		<icon annotate="true" src="misc/proposed.png" />
-		<area colour="#ecba52"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
-	
 	<rule>
 		<condition k="shop" v="beverages" />