Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 1241)
+++ trunk/styles/standard/elemstyles.xml	(revision 1248)
@@ -444,5 +444,5 @@
 	<rule>
 		<condition k="highway" v="track"/>
-		<line width="1" realwidth="3" colour="track#006600" priority="-10000"/>
+		<line width="1" realwidth="3" colour="highway_track#006600" priority="-10000"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -709,5 +709,5 @@
 	<rule>
 		<condition k="tracktype" v="grade1"/>
-		<line width="1" realwidth="3" dashed="true" colour="track#006600"/>
+		<line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -717,5 +717,5 @@
 	<rule>
 		<condition k="tracktype" v="grade2"/>
-		<line width="1" realwidth="3" dashed="true" colour="track#006600"/>
+		<line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -725,5 +725,5 @@
 	<rule>
 		<condition k="tracktype" v="grade3"/>
-		<line width="1" realwidth="3" dashed="true" colour="track#006600"/>
+		<line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -733,5 +733,5 @@
 	<rule>
 		<condition k="tracktype" v="grade4"/>
-		<line width="1" realwidth="3" dashed="true" colour="track#006600"/>
+		<line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -741,5 +741,5 @@
 	<rule>
 		<condition k="tracktype" v="grade5"/>
-		<line width="1" realwidth="3" dashed="true" colour="track#006600"/>
+		<line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -1045,5 +1045,5 @@
 	<rule>
 		<condition k="aeroway" v="aerodrome"/>
-		<line width="2" colour="aeroway1#660000" dashed="true"/>
+		<line width="2" colour="aeroway#660000" dashed="true"/>
 		<icon annotate="true" src="transport/airport.png"/>
 		<scale_min>1</scale_min>
@@ -1061,5 +1061,5 @@
 	<rule>
 		<condition k="aeroway" v="helipad"/>
-		<area colour="aeroway2#330000"/>
+		<area colour="aeroway_dark#330000"/>
 		<icon annotate="true" src="transport/airport/helipad.png"/>
 		<scale_min>1</scale_min>
@@ -1069,5 +1069,5 @@
 	<rule>
 		<condition k="aeroway" v="runway"/>
-		<line width="3" colour="aeroway2#330000"/>
+		<line width="3" colour="aeroway_dark#330000"/>
 		<icon annotate="true" src="transport/airport.png"/>
 		<scale_min>1</scale_min>
@@ -1077,5 +1077,5 @@
 	<rule>
 		<condition k="aeroway" v="taxiway"/>
-		<line width="2" colour="aeroway1#660000"/>
+		<line width="2" colour="aeroway#660000"/>
 		<icon annotate="true" src="transport/airport.png"/>
 		<scale_min>1</scale_min>
@@ -1085,5 +1085,5 @@
 	<rule>
 		<condition k="aeroway" v="apron"/>
-		<area colour="aeroway3#990000"/>
+		<area colour="aeroway_light#990000"/>
 		<icon annotate="true" src="transport/airport.png"/>
 		<scale_min>1</scale_min>
@@ -1642,5 +1642,5 @@
 		<condition k="amenity" v="telephone"/>
 		<icon annotate="true" src="public/telephone.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1650,5 +1650,5 @@
 		<condition k="amenity" v="emergency_phone"/>
 		<icon annotate="true" src="vehicle/emergency_phone.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1658,5 +1658,5 @@
 		<condition k="amenity" v="toilets"/>
 		<icon annotate="true" src="public/toilets.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1666,5 +1666,5 @@
 		<condition k="amenity" v="recycling"/>
 		<icon annotate="true" src="public/recycling.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1674,5 +1674,5 @@
 		<condition k="amenity" v="public_building"/>
 		<icon annotate="true" src="public.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1682,5 +1682,5 @@
 		<condition k="amenity" v="embassy"/>
 		<icon annotate="true" src="public.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1690,5 +1690,5 @@
 		<condition k="amenity" v="townhall"/>
 		<icon annotate="true" src="public.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1698,5 +1698,5 @@
 		<condition k="amenity" v="community_centre"/>
 		<icon annotate="true" src="public.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1792,5 +1792,5 @@
 		<condition k="amenity" v="place_of_worship" priority="-10000"/>
 		<icon annotate="true" src="religion.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1800,5 +1800,5 @@
 		<condition k="amenity" v="grave_yard"/>
 		<icon annotate="true" src="religion/cemetery.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1807,5 +1807,5 @@
 	<rule>
 		<condition k="amenity" v="crematorium"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
@@ -1816,5 +1816,5 @@
 		<condition k="amenity" v="post_office"/>
 		<icon annotate="true" src="public/post_office.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1824,5 +1824,5 @@
 		<condition k="amenity" v="post_box"/>
 		<icon annotate="true" src="public/post_box.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1832,5 +1832,5 @@
 		<condition k="amenity" v="school"/>
 		<icon annotate="true" src="education/school.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1840,5 +1840,5 @@
 		<condition k="amenity" v="university"/>
 		<icon annotate="true" src="education/university.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1848,5 +1848,5 @@
 		<condition k="amenity" v="college"/>
 		<icon annotate="true" src="education/college.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1856,5 +1856,5 @@
 		<condition k="amenity" v="kindergarten"/>
 		<icon annotate="true" src="education/kindergarten.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1864,5 +1864,5 @@
 		<condition k="amenity" v="driving_school"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1919,5 +1919,5 @@
 	<rule>
 		<condition k="amenity" v="library"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="shopping/rental/library.png"/>
 		<scale_min>1</scale_min>
@@ -1927,5 +1927,5 @@
 	<rule>
 		<condition k="amenity" v="police"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="public/police.png"/>
 		<scale_min>1</scale_min>
@@ -1935,5 +1935,5 @@
 	<rule>
 		<condition k="amenity" v="fire_station"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="public/firebrigade.png"/>
 		<scale_min>1</scale_min>
@@ -1944,5 +1944,5 @@
 		<condition k="amenity" v="bus_station"/>
 		<icon annotate="true" src="transport/bus.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1952,5 +1952,5 @@
 		<condition k="amenity" v="ferry_terminal"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1959,5 +1959,5 @@
 	<rule>
 		<condition k="amenity" v="theatre"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="recreation/theater.png"/>
 		<scale_min>1</scale_min>
@@ -1967,5 +1967,5 @@
 	<rule>
 		<condition k="amenity" v="cinema"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="recreation/cinema.png"/>
 		<scale_min>1</scale_min>
@@ -1975,5 +1975,5 @@
 	<rule>
 		<condition k="amenity" v="arts_centre"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="public/arts_centre.png"/>
 		<scale_min>1</scale_min>
@@ -1983,5 +1983,5 @@
 	<rule>
 		<condition k="amenity" v="courthouse"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="public/administration/court_of_law.png"/>
 		<scale_min>1</scale_min>
@@ -1991,5 +1991,5 @@
 	<rule>
 		<condition k="amenity" v="prison"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="public/administration/prison.png"/>
 		<scale_min>1</scale_min>
@@ -1999,5 +1999,5 @@
 	<rule>
 		<condition k="amenity" v="bank"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="money/bank.png"/>
 		<scale_min>1</scale_min>
@@ -2007,5 +2007,5 @@
 	<rule>
 		<condition k="amenity" v="bureau_de_change"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="money/exchange.png"/>
 		<scale_min>1</scale_min>
@@ -2015,5 +2015,5 @@
 	<rule>
 		<condition k="amenity" v="atm"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="money/atm.png"/>
 		<scale_min>1</scale_min>
@@ -2023,5 +2023,5 @@
 	<rule>
 		<condition k="amenity" v="bench"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="recreation/bench.png"/>
 		<scale_min>1</scale_min>
@@ -2031,5 +2031,5 @@
 	<rule>
 		<condition k="amenity" v="shelter"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="accommodation/shelter.png"/>
 		<scale_min>1</scale_min>
@@ -2039,5 +2039,5 @@
 	<rule>
 		<condition k="amenity" v="hunting_stand"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<icon annotate="true" src="accommodation/shelter.png"/>
 		<scale_min>1</scale_min>
@@ -2048,5 +2048,5 @@
 		<condition k="amenity" v="wlan"/>
 		<icon annotate="true" src="wlan.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2056,5 +2056,5 @@
 		<condition k="amenity" v="vending_machine"/>
 		<icon src="transport/ticket-machine.png"/>
-		<area colour="amenity2#f7efb7"/>
+		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>