Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 680)
+++ trunk/styles/standard/elemstyles.xml	(revision 681)
@@ -755,4 +755,5 @@
 		<condition k="leisure" v="sports_centre" />
 		<icon annotate="true" src="sports/centre.png" />
+        <area colour="#c7f1a3" />		
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -762,4 +763,5 @@
 		<condition k="leisure" v="golf_course" />
 		<icon annotate="true" src="sports/golf.png" />
+        <area colour="#c7f1a3" />		
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -769,4 +771,5 @@
 		<condition k="leisure" v="stadium" />
 		<icon annotate="true" src="sports/stadium.png" />
+        <area colour="#c7f1a3" />		
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -776,4 +779,5 @@
 		<condition k="leisure" v="track" />
 		<icon annotate="true" src="sports/track.png" />
+        <area colour="#c7f1a3" />		
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -791,4 +795,5 @@
 		<condition k="leisure" v="water_park" />
 		<icon annotate="true" src="recreation/water_park.png" />
+        <area colour="#c7f1a3" />		
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -798,4 +803,5 @@
 		<condition k="leisure" v="marina" />
 		<icon annotate="true" src="nautical/marina.png" />
+        <area colour="#c7f1a3" />		
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -805,4 +811,5 @@
 		<condition k="leisure" v="slipway" />
 		<icon annotate="true" src="nautical/slipway.png" />
+        <area colour="#c7f1a3" />		
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -812,4 +819,5 @@
 		<condition k="leisure" v="fishing" />
 		<icon annotate="true" src="sports/fishing.png" />
+        <area colour="#c7f1a3" />		
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -819,4 +827,5 @@
 		<condition k="leisure" v="nature_reserve" />
 		<icon annotate="true" src="recreation/nature_reserve.png" />
+        <area colour="#c7f1a3" />		
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -842,4 +851,5 @@
 		<condition k="leisure" v="garden" />
 		<icon annotate="true" src="recreation/garden.png" />
+        <area colour="#c7f1a3" />		
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -849,4 +859,21 @@
 		<condition k="leisure" v="common" />
 		<icon annotate="true" src="recreation/common.png" />
+		<area colour="#c7f1a3"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="leisure" v="swimming_pool" />
+		<icon annotate="true" src="sports/pool.png" />
+		<area colour="#c7f1a3"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="leisure" v="miniature_golf" />
+		<icon annotate="true" src="sports/golf.png" />
+		<area colour="#c7f1a3"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -953,4 +980,5 @@
 		<condition k="amenity" v="telephone" />
 		<icon annotate="true" src="public/telephone.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -987,4 +1015,11 @@
 	</rule>
 
+	<rule>
+		<condition k="amenity" v="drinking_water" />
+		<icon annotate="true" src="misc/no_icon.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	  	
 	<!--the religion rules must be placed before the place_of_worship rule! -->
 	<rule>
@@ -1150,4 +1185,5 @@
 		<condition k="amenity" v="bus_station" />
 		<icon annotate="true" src="transport/bus.png" />
+		<area colour="#f7efb7"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1296,4 +1332,5 @@
 		<condition k="tourism" v="information" />
 		<icon annotate="true" src="misc/information.png" />
+		<area colour="#e180a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1303,4 +1340,5 @@
 		<condition k="tourism" v="hotel" />
 		<icon annotate="true" src="accommodation.png" />
+		<area colour="#e1a0a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1310,4 +1348,5 @@
 		<condition k="tourism" v="motel" />
 		<icon annotate="true" src="accommodation/motel.png" />
+		<area colour="#e1a0a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1317,4 +1356,5 @@
 		<condition k="tourism" v="guest_house" />
 		<icon annotate="true" src="accommodation/guest_house.png" />
+		<area colour="#e1a0a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1324,4 +1364,5 @@
 		<condition k="tourism" v="hostel" />
 		<icon annotate="true" src="accommodation/hostel.png" />
+		<area colour="#e1a0a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1331,4 +1372,5 @@
 		<condition k="tourism" v="camp_site" />
 		<icon annotate="true" src="accommodation/camping.png" />
+		<area colour="#e1a0a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1338,4 +1380,5 @@
 		<condition k="tourism" v="caravan_site" />
 		<icon annotate="true" src="accommodation/camping/caravan.png" />
+		<area colour="#e1a0a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1345,4 +1388,5 @@
 		<condition k="tourism" v="picnic_site" />
 		<icon annotate="true" src="recreation/picnic.png" />
+		<area colour="#e180a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1352,4 +1396,5 @@
 		<condition k="tourism" v="viewpoint" />
 		<icon annotate="true" src="sightseeing/viewpoint.png" />
+		<area colour="#e180a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1359,4 +1404,5 @@
 		<condition k="tourism" v="theme_park" />
 		<icon annotate="true" src="recreation/theme_park.png" />
+		<area colour="#e180a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1366,4 +1412,5 @@
         <condition k="tourism" v="attraction"/>
         <icon annotate="true" src="sightseeing.png"/>
+		<area colour="#e180a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1373,4 +1420,5 @@
         <condition k="tourism" v="zoo"/>
         <icon annotate="true" src="recreation/zoo.png"/>
+		<area colour="#e180a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1380,4 +1428,5 @@
         <condition k="tourism" v="artwork"/>
         <icon annotate="true" src="public/arts_centre.png"/>
+		<area colour="#e180a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1395,4 +1444,5 @@
 		<condition k="historic" v="castle" />
 		<icon annotate="true" src="sightseeing/castle.png" />
+		<area colour="#a1e0a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1402,4 +1452,5 @@
 		<condition k="historic" v="monument" />
 		<icon annotate="true" src="sightseeing/monument.png" />
+		<area colour="#a1e0a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1409,4 +1460,5 @@
 		<condition k="historic" v="memorial" />
 		<icon annotate="true" src="sightseeing/memorial.png" />
+		<area colour="#a1e0a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1416,4 +1468,5 @@
 		<condition k="historic" v="archaeological_site" />
 		<icon annotate="true" src="sightseeing/archaeological.png" />
+		<area colour="#a1e0a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1423,4 +1476,5 @@
 		<condition k="historic" v="ruins" />
 		<icon annotate="true" src="sightseeing/ruins.png" />
+		<area colour="#a1e0a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1430,4 +1484,13 @@
 		<condition k="historic" v="battlefield" />
 		<icon annotate="true" src="sightseeing/battlefield.png" />
+		<area colour="#a1e0a2" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="historic" v="wayside_cross" />
+		<icon annotate="true" src="misc/no_icon.png" />
+		<area colour="#a1e0a2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -2265,8 +2328,16 @@
         <scale_max>50000</scale_max>
 	</rule>
+	
+	<rule>
+		<condition k="amenity" v="crematorium" />
+		<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>
@@ -2393,5 +2464,5 @@
 
 	<rule>
-		<condition k="shop" v="flowers" />
+		<condition k="shop" v="florist" />
 		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
@@ -2407,4 +2478,12 @@
 
 	<rule>
+		<condition k="shop" v="garden_centre" />
+		<icon annotate="true" src="misc/proposed.png" />
+		<area colour="#00005f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="hairdresser" />
 		<icon annotate="true" src="misc/proposed.png" />
@@ -2414,4 +2493,18 @@
 
 	<rule>
+		<condition k="shop" v="hardware" />
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="hifi" />
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="jewelry" />
 		<icon annotate="true" src="misc/proposed.png" />
@@ -2435,4 +2528,11 @@
 
 	<rule>
+		<condition k="shop" v="newsagent" />
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="organic" />
 		<icon annotate="true" src="misc/proposed.png" />
@@ -2464,4 +2564,11 @@
 	<rule>
 		<condition k="shop" v="travel_agency" />
+		<icon annotate="true" src="misc/proposed.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="toys" />
 		<icon annotate="true" src="misc/proposed.png" />
         <scale_min>1</scale_min>
@@ -2496,3 +2603,10 @@
 		<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>
 </rules>