Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 708)
+++ trunk/styles/standard/elemstyles.xml	(revision 709)
@@ -91,6 +91,6 @@
 	<rule>
 		<condition k="highway" v="road"/>
-		<line width="2" realwidth="5" dashed="true" colour="#ff4040"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
+		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
         <scale_max>40000</scale_max>
@@ -328,5 +328,5 @@
 	<rule>
 		<condition k="highway" v="construction" />
-		<line width="3" realwidth="5" colour="#FFFF00"/>
+		<line width="2" realwidth="5" colour="#FFFF00"/>
 		<icon src="misc/construction.png" />
         <scale_min>1</scale_min>
@@ -339,4 +339,5 @@
 		<condition k="junction" v="roundabout" />
         <area width="1" colour="#eeeeee" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -545,4 +546,5 @@
 	<rule>
 		<condition k="railway" v="station" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="transport/railway.png" />
         <scale_min>1</scale_min>
@@ -566,4 +568,5 @@
 	<rule>
 		<condition k="railway" v="viaduct" />
+		<line width="3" colour="#808080" dashed="true"/>
 		<icon annotate="true" src="vehicle/viaduct.png" />
         <scale_min>1</scale_min>
@@ -573,4 +576,5 @@
 	<rule>
 		<condition k="railway" v="crossing" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="vehicle/crossing_small.png" />
         <scale_min>1</scale_min>
@@ -580,4 +584,5 @@
 	<rule>
 		<condition k="railway" v="level_crossing" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="vehicle/crossing.png" />
         <scale_min>1</scale_min>
@@ -595,5 +600,5 @@
     <rule>
         <condition k="railway" v="tram"/>
-        <line width="1" colour="#606060" dashed="true"/>
+        <line width="1" colour="#808080" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -611,5 +616,5 @@
     <rule>
         <condition k="railway" v="subway"/>
-        <line width="1" colour="#303030" dashed="true"/>
+        <line width="1" colour="#606060" dashed="true"/>
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -619,4 +624,5 @@
     <rule>
         <condition k="railway" v="subway_entrance"/>
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="transport/underground.png" />
         <scale_min>1</scale_min>
@@ -674,5 +680,5 @@
 	<rule>
 		<condition k="service" v="yard" />
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -681,5 +687,5 @@
 	<rule>
 		<condition k="service" v="siding" />
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -688,5 +694,5 @@
 	<rule>
 		<condition k="service" v="spur" />
-		<icon annotate="true" src="misc/proposed.png" />
+		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -696,4 +702,5 @@
     <rule>
         <condition k="aeroway" v="aerodrome"/>
+        <line width="2" colour="#660000" dashed="true"/>
 		<icon annotate="true" src="transport/airport.png" />
         <scale_min>1</scale_min>
@@ -703,4 +710,5 @@
     <rule>
         <condition k="aeroway" v="terminal"/>
+        <area colour="#BB0000" />
 		<icon annotate="true" src="transport/airport/terminal.png" />
         <scale_min>1</scale_min>
@@ -710,4 +718,5 @@
     <rule>
         <condition k="aeroway" v="helipad"/>
+        <area colour="#330000" />
 		<icon annotate="true" src="transport/airport/helipad.png" />
         <scale_min>1</scale_min>
@@ -733,5 +742,5 @@
     <rule>
         <condition k="aeroway" v="apron"/>
-        <area colour="#D8D8D8" />
+        <area colour="#990000" />
 		<icon annotate="true" src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -819,4 +828,5 @@
 		<condition k="power" v="tower" />
 		<icon annotate="true" src="misc/landmark/power/tower.png" />
+        <area width="1" colour="#eeeeee" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -826,5 +836,5 @@
 		<condition k="power" v="line" />
         <line width="1" colour="#eeeeee" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="misc/landmark/power.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1118,4 +1128,5 @@
 		<condition k="amenity" v="pub" />
 		<icon annotate="true" src="food/pub.png"  />
+		<area colour="#ecba52"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1125,4 +1136,5 @@
 		<condition k="amenity" v="biergarten" />
 		<icon annotate="true" src="food/biergarten.png"  />
+		<area colour="#ecba52"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1132,4 +1144,5 @@
 		<condition k="amenity" v="nightclub" />
 		<icon annotate="true" src="recreation/nightclub.png"  />
+		<area colour="#ecba52"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1139,4 +1152,5 @@
 		<condition k="amenity" v="cafe" />
 		<icon annotate="true" src="food/cafe.png"  />
+		<area colour="#ecba52"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1146,4 +1160,5 @@
 		<condition k="amenity" v="restaurant" />
 		<icon annotate="true" src="food/restaurant.png" />
+		<area colour="#ecba52"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1153,4 +1168,5 @@
 		<condition k="amenity" v="fast_food" />
 		<icon annotate="true" src="food/fastfood.png" />
+		<area colour="#ecba52"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1176,4 +1192,5 @@
 		<condition k="amenity" v="bicycle_rental" />
 		<icon annotate="true" src="vehicle/bicycle_rental.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1207,4 +1224,5 @@
 		<condition k="amenity" v="fuel" />
 		<icon annotate="true" src="vehicle/fuel_station.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1222,4 +1240,5 @@
 		<condition k="amenity" v="toilets" />
 		<icon annotate="true" src="public/toilets.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1229,4 +1248,5 @@
 		<condition k="amenity" v="recycling" />
 		<icon annotate="true" src="public/recycling.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1244,5 +1264,5 @@
 		<condition k="amenity" v="townhall" />
 		<icon annotate="true" src="public.png" />
-		<area colour="#00005f"/>
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1252,4 +1272,5 @@
 		<condition k="amenity" v="drinking_water" />
 		<icon annotate="true" src="misc/drinking_water.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1346,4 +1367,5 @@
 		<condition k="amenity" v="post_office" />
 		<icon annotate="true" src="public/post_office.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1353,4 +1375,5 @@
 		<condition k="amenity" v="post_box" />
 		<icon annotate="true" src="public/post_box.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1383,4 +1406,5 @@
 	<rule>
 		<condition k="amenity" v="pharmacy" />
+        <area colour="#eeeeee" />
 		<icon annotate="true" src="health/pharmacy.png" />
         <scale_min>1</scale_min>
@@ -1398,4 +1422,5 @@
 	<rule>
 		<condition k="amenity" v="library" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="shopping/rental/library.png" />
         <scale_min>1</scale_min>
@@ -1405,4 +1430,5 @@
 	<rule>
 		<condition k="amenity" v="police" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="public/police.png" />
         <scale_min>1</scale_min>
@@ -1412,4 +1438,5 @@
 	<rule>
 		<condition k="amenity" v="fire_station" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="public/firebrigade.png" />
         <scale_min>1</scale_min>
@@ -1427,4 +1454,5 @@
 	<rule>
 		<condition k="amenity" v="theatre" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="recreation/theater.png" />
         <scale_min>1</scale_min>
@@ -1434,4 +1462,5 @@
 	<rule>
 		<condition k="amenity" v="cinema" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="recreation/cinema.png" />
         <scale_min>1</scale_min>
@@ -1441,4 +1470,5 @@
 	<rule>
 		<condition k="amenity" v="arts_centre" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="public/arts_centre.png" />
         <scale_min>1</scale_min>
@@ -1448,4 +1478,5 @@
 	<rule>
 		<condition k="amenity" v="courthouse" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="public/administration/court_of_law.png" />
         <scale_min>1</scale_min>
@@ -1455,4 +1486,5 @@
 	<rule>
 		<condition k="amenity" v="prison" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="public/administration/prison.png" />
         <scale_min>1</scale_min>
@@ -1462,4 +1494,5 @@
 	<rule>
 		<condition k="amenity" v="bank" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="money/bank.png" />
         <scale_min>1</scale_min>
@@ -1469,4 +1502,5 @@
 	<rule>
 		<condition k="amenity" v="bureau_de_change" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="money/exchange.png" />
         <scale_min>1</scale_min>
@@ -1476,4 +1510,5 @@
 	<rule>
 		<condition k="amenity" v="atm" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="money/atm.png" />
         <scale_min>1</scale_min>
@@ -1518,4 +1553,5 @@
 		<condition k="shop" v="butcher" />
 		<icon annotate="true" src="shopping/groceries/butcher.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1525,4 +1561,5 @@
 		<condition k="shop" v="bicycle" />
 		<icon annotate="true" src="sports/bicycle.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1532,4 +1569,5 @@
 		<condition k="shop" v="doityourself" />
 		<icon annotate="true" src="shopping/diy_store.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1538,5 +1576,6 @@
 	<rule>
 		<condition k="shop" v="dry_cleaning" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="shopping/laundry.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1546,4 +1585,5 @@
 		<condition k="shop" v="laundry" />
 		<icon annotate="true" src="shopping/laundry.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1553,4 +1593,5 @@
 		<condition k="shop" v="outdoor" />
 		<icon annotate="true" src="shopping/sports/outdoor.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1673,4 +1714,5 @@
 		<condition k="tourism" v="museum" />
 		<icon annotate="true" src="sightseeing/museum.png" />
+		<area colour="#e180a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1681,5 +1723,5 @@
 		<condition k="historic" v="castle" />
 		<icon annotate="true" src="sightseeing/castle.png" />
-		<area colour="#a1e0a2" />
+        <area colour="#663300" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1689,5 +1731,5 @@
 		<condition k="historic" v="monument" />
 		<icon annotate="true" src="sightseeing/monument.png" />
-		<area colour="#a1e0a2" />
+        <area colour="#663300" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1697,5 +1739,5 @@
 		<condition k="historic" v="memorial" />
 		<icon annotate="true" src="sightseeing/memorial.png" />
-		<area colour="#a1e0a2" />
+        <area colour="#663300" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1705,5 +1747,5 @@
 		<condition k="historic" v="archaeological_site" />
 		<icon annotate="true" src="sightseeing/archaeological.png" />
-		<area colour="#a1e0a2" />
+        <area colour="#663300" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1713,5 +1755,5 @@
 		<condition k="historic" v="ruins" />
 		<icon annotate="true" src="sightseeing/ruins.png" />
-		<area colour="#a1e0a2" />
+        <area colour="#663300" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1721,5 +1763,5 @@
 		<condition k="historic" v="battlefield" />
 		<icon annotate="true" src="sightseeing/battlefield.png" />
-		<area colour="#a1e0a2" />
+        <area colour="#663300" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1729,5 +1771,5 @@
 		<condition k="historic" v="wayside_cross" />
 		<icon annotate="true" src="misc/no_icon.png" />
-		<area colour="#a1e0a2" />
+        <area colour="#663300" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1745,5 +1787,5 @@
     <rule>
         <condition k="landuse" v="quarry"/>
-        <area colour="#cccccc" />
+        <area colour="#888888" />
 		<icon src="misc/landmark/mine.png" />
         <scale_min>1</scale_min>
@@ -1841,5 +1883,5 @@
 	<rule>
 		<condition k="landuse" v="railway"/>
-		<area colour="#b1ec5c"/>
+		<area colour="#888888"/>
 		<icon src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -1849,5 +1891,5 @@
 	<rule>
 		<condition k="landuse" v="construction"/>
-		<area colour="#b1ec5c"/>
+		<area colour="#FFFF00"/>
 		<icon src="misc/construction.png" />
         <scale_min>1</scale_min>
@@ -1857,5 +1899,5 @@
 	<rule>
 		<condition k="landuse" v="military"/>
-		<area colour="#b1ec5c"/>
+		<area colour="#b62c2c"/>
 		<icon src="misc/no_icon.png" />
         <scale_min>1</scale_min>
@@ -1865,5 +1907,5 @@
 	<rule>
 		<condition k="landuse" v="cemetery"/>
-		<area colour="#bde3cb"/>
+		<area colour="#b1efc8" />
 		<icon src="religion/cemetery.png" />
         <scale_min>1</scale_min>
@@ -1932,4 +1974,5 @@
         <condition k="natural" v="spring"/>
         <icon annotate="true" src="misc/landmark/spring.png"/>
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1938,4 +1981,5 @@
     <rule>
         <condition k="natural" v="peak"/>
+        <area colour="#663300" />
         <icon annotate="true" src="misc/landmark/peak_small.png"/>
         <scale_min>1</scale_min>
@@ -1954,4 +1998,5 @@
         <condition k="natural" v="volcano"/>
         <icon annotate="true" src="misc/no_icon.png"/>
+		<area colour="#5f0000"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2443,8 +2488,148 @@
 
 	<rule>
+		<condition k="access" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="bicycle" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="foot" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="goods" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="hgv" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="horse" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="motorcycle" v="no" />
 		<icon src="vehicle/restrictions/motorbike.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="motorcar" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="psv" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="motorboat" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="boat" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="noexit" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxweight" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxheight" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxwidth" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxlength" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxspeed" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="minspeed" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="maxstay" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="toll" v="no" />
+		<icon src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="barrier" v="bollard" />
+		<icon annotate="true" src="misc/proposed.png" />
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
 	</rule>
 
@@ -2571,4 +2756,5 @@
 		<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>
@@ -2577,4 +2763,5 @@
 	<rule>
 		<condition k="amenity" v="crematorium" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
@@ -2592,4 +2779,5 @@
 	<rule>
 		<condition k="amenity" v="park_bench" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
@@ -2599,4 +2787,5 @@
 	<rule>
 		<condition k="amenity" v="sheltered_housing" />
+        <area colour="#eeeeee" />
 		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
@@ -2606,11 +2795,5 @@
 	<rule>
 		<condition k="amenity" v="nursery" />
-		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="amenity" v="kindergarden" />
+        <area colour="#eeeeee" />
 		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
@@ -2620,4 +2803,5 @@
 	<rule>
 		<condition k="amenity" v="shelter" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="misc/proposed.png" />
 		<scale_min>1</scale_min>
@@ -2627,4 +2811,5 @@
 	<rule>
 		<condition k="amenity" v="car_wash" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="misc/proposed.png" />
 		<scale_min>1</scale_min>
@@ -2634,4 +2819,5 @@
 	<rule>
 		<condition k="amenity" v="dentist" />
+        <area colour="#eeeeee" />
 		<icon annotate="true" src="misc/proposed.png" />
 		<scale_min>1</scale_min>
@@ -2642,4 +2828,5 @@
 		<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>
@@ -2649,4 +2836,5 @@
 		<condition k="shop" v="beverages" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2656,4 +2844,5 @@
 		<condition k="shop" v="bicycle" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2663,4 +2852,5 @@
 		<condition k="shop" v="books" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2670,4 +2860,5 @@
 		<condition k="shop" v="car" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2677,4 +2868,5 @@
 		<condition k="shop" v="car_repair" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2684,4 +2876,5 @@
 		<condition k="shop" v="chemist" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2691,4 +2884,5 @@
 		<condition k="shop" v="clothes" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2698,4 +2892,5 @@
 		<condition k="shop" v="computer" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2705,4 +2900,5 @@
 		<condition k="shop" v="cycle_repair" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2712,4 +2908,5 @@
 		<condition k="shop" v="department_store" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2719,4 +2916,5 @@
 		<condition k="shop" v="electronics" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2726,4 +2924,5 @@
 		<condition k="shop" v="furniture" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2733,4 +2932,5 @@
 		<condition k="shop" v="florist" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2740,4 +2940,5 @@
 		<condition k="shop" v="food" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2755,4 +2956,5 @@
 		<condition k="shop" v="hairdresser" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2762,4 +2964,5 @@
 		<condition k="shop" v="hardware" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2769,4 +2972,5 @@
 		<condition k="shop" v="hifi" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2776,4 +2980,5 @@
 		<condition k="shop" v="jewelry" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2783,4 +2988,5 @@
 		<condition k="shop" v="mall" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2790,4 +2996,5 @@
 		<condition k="shop" v="motorcycle" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2797,4 +3004,5 @@
 		<condition k="shop" v="newsagent" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2804,4 +3012,5 @@
 		<condition k="shop" v="organic" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2811,4 +3020,5 @@
 		<condition k="shop" v="optician" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2818,4 +3028,5 @@
 		<condition k="shop" v="shoes" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2825,4 +3036,5 @@
 		<condition k="shop" v="tailor" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2832,4 +3044,5 @@
 		<condition k="shop" v="travel_agency" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2839,4 +3052,5 @@
 		<condition k="shop" v="toys" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2846,4 +3060,5 @@
 		<condition k="shop" v="video" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2853,4 +3068,5 @@
 		<condition k="shop" v="shopping_center" />
 		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2860,16 +3076,19 @@
 		<condition k="historic" v="church" />
 		<icon annotate="true" src="misc/proposed.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="barrier" v="bollard" />
-		<icon annotate="true" src="misc/proposed.png" />
+        <area colour="#663300" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<!-- keep this generic rules at the end of the file, so more specialised rules fit first -->
+	<rule>
+		<condition k="building" v="yes"/>
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#bde3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 	<rule>
-		<condition k="building" v="yes"/>
+		<condition k="building" v="true"/>
 		<icon annotate="true" src="misc/proposed.png" />
 		<area colour="#bde3cb"/>
@@ -2877,11 +3096,5 @@
 		<scale_max>50000</scale_max>
 	</rule>
-	<rule>
-		<condition k="building" v="true"/>
-		<icon annotate="true" src="misc/proposed.png" />
-		<area colour="#bde3cb"/>
-		<scale_min>1</scale_min>
-		<scale_max>50000</scale_max>
-	</rule>
+
 	<rule>
 		<condition k="waterway" v="waterfall" />
@@ -2894,4 +3107,5 @@
 	<rule>
 		<condition k="sport" v="paintball" />
+		<area colour="#bde3cb"/>
 		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
@@ -2900,4 +3114,5 @@
 	<rule>
 		<condition k="sport" v="squash" />
+		<area colour="#bde3cb"/>
 		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
@@ -2906,4 +3121,5 @@
 	<rule>
 		<condition k="railway" v="tram_station" />
+		<area colour="#f7efb7"/>
 		<icon annotate="true" src="transport/railway.png" />
         <scale_min>1</scale_min>
@@ -2914,4 +3130,5 @@
 	<rule>
 		<condition k="historic" v="museum" />
+		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
 		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
@@ -2921,4 +3138,5 @@
 	<rule>
 		<condition k="man_made" v="power_wind" />
+		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
 		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
@@ -2928,4 +3146,5 @@
 	<rule>
 		<condition k="man_made" v="power_hydro" />
+		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
 		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
@@ -2935,4 +3154,5 @@
 	<rule>
 		<condition k="man_made" v="power_fossil" />
+		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
 		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
@@ -2942,4 +3162,5 @@
 	<rule>
 		<condition k="man_made" v="power_nuclear" />
+		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
 		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
@@ -2950,4 +3171,5 @@
 	<rule>
 		<condition k="shop" v="laundromat" />
+		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
 		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>
@@ -2966,4 +3188,5 @@
 	<rule>
 		<condition k="leisure" v="zoo" />
+		<line width="2" realwidth="5" dashed="true" colour="#ff0000"/>
 		<icon annotate="true" src="misc/deprecated.png" />
         <scale_min>1</scale_min>