Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 519)
+++ trunk/styles/standard/elemstyles.xml	(revision 520)
@@ -80,4 +80,11 @@
     </rule>
 
+	<rule>
+		<condition k="highway" v="unsurfaced"/>
+		<line width="1" realwidth="3" colour="#c0c0c0"/>
+        <scale_min>1</scale_min>
+        <scale_max>40000</scale_max>
+    </rule>
+
     <rule>
         <condition k="highway" v="track"/>
@@ -244,4 +251,11 @@
 		<condition k="highway" v="bus_stop" />
 		<icon annotate="true" src="transport/bus_small.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="highway" v="construction" />
+		<line width="3" realwidth="5" colour="#00ff00"/>		
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -309,10 +323,10 @@
 	</rule>
 
-	<rule>
+	<!--rule>
 		<condition k="waterway" v="riverbank"/>
         <line width="1" colour="#00005f" width_bg="1" colour_bg="#00001f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
-	</rule>
+	</rule-->
 
 	<rule>
@@ -404,4 +418,5 @@
 		<condition k="waterway" v="dam" />
         <line width="2" colour="#D8D8D8" />
+		<!-- it's not possible to have both line and area, line seems more likely -->
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -586,4 +601,5 @@
 		<condition k="power" v="sub_station" />
 		<icon annotate="true" src="misc/landmark/power.png" />
+        <area width="1" colour="#eeeeee" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -728,11 +744,4 @@
 
 	<rule>
-		<condition k="leisure" v="marina" />
-		<icon annotate="true" src="nautical/marina.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="leisure" v="track" />
 		<icon annotate="true" src="sports/track.png" />
@@ -757,4 +766,11 @@
 
 	<rule>
+		<condition k="leisure" v="marina" />
+		<icon annotate="true" src="nautical/marina.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="leisure" v="slipway" />
 		<icon annotate="true" src="nautical/slipway.png" />
@@ -823,13 +839,13 @@
 
 	<rule>
+		<condition k="amenity" v="nightclub" />
+		<icon annotate="true" src="recreation/nightclub.png"  />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="amenity" v="cafe" />
 		<icon annotate="true" src="food/cafe.png"  />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="amenity" v="nightclub" />
-		<icon annotate="true" src="recreation/nightclub.png"  />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -861,4 +877,5 @@
 		<condition k="amenity" v="bicycle_parking" />
 		<icon annotate="true" src="vehicle/parking/bike.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -875,4 +892,5 @@
 		<condition k="amenity" v="car_rental" />
 		<icon annotate="true" src="vehicle/car_rental.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -882,4 +900,5 @@
 		<condition k="amenity" v="car_sharing" />
 		<icon annotate="true" src="vehicle/car_sharing.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -889,4 +908,5 @@
 		<condition k="amenity" v="taxi" />
 		<icon annotate="true" src="transport/taxi.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -924,4 +944,13 @@
 		<condition k="amenity" v="public_building" />
 		<icon annotate="true" src="public.png" />
+		<area colour="#f7efb7"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="amenity" v="townhall" />
+		<icon annotate="true" src="public.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -938,4 +967,5 @@
 		<condition k="amenity" v="grave_yard" />
 		<icon annotate="true" src="religion/cemetery.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -959,4 +989,5 @@
 		<condition k="amenity" v="school" />
 		<icon annotate="true" src="education/school.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -966,4 +997,5 @@
 		<condition k="amenity" v="university" />
 		<icon annotate="true" src="education/university.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -973,4 +1005,5 @@
 		<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>
@@ -1077,11 +1110,4 @@
 
 	<rule>
-		<condition k="amenity" v="townhall" />
-		<icon annotate="true" src="public.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="amenity" v="fountain"/>
 		<icon annotate="true" src="misc/landmark/spring.png" />
@@ -1096,4 +1122,5 @@
 		<condition k="shop" v="supermarket" />
 		<icon annotate="true" src="shopping/supermarket.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1129,4 +1156,11 @@
 
 	<rule>
+		<condition k="shop" v="dry_cleaning" />
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="outdoor" />
 		<icon annotate="true" src="shopping/sports/outdoor.png" />
@@ -1138,4 +1172,5 @@
 		<condition k="shop" v="kiosk" />
 		<icon annotate="true" src="shopping/kiosk.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1216,4 +1251,11 @@
         <condition k="tourism" v="attraction"/>
         <icon annotate="true" src="sightseeing.png"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+
+    <rule>
+        <condition k="tourism" v="zoo"/>
+        <icon annotate="true" src="recreation/zoo.png"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2103,11 +2145,4 @@
 
 	<rule>
-		<condition k="leisure" v="zoo" />
-		<icon annotate="true" src="vehicle/caution.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="historic" v="church" />
 		<icon annotate="true" src="vehicle/caution.png" />