Index: styles/standard/elemstyles.xml
===================================================================
--- styles/standard/elemstyles.xml	(Revision 2929)
+++ styles/standard/elemstyles.xml	(Arbeitskopie)
@@ -10,11 +10,11 @@
 3. line attributes
 	- width absolute width in pixel in every zoom level
 	- realwidth relative width which will be scaled in meters, integer
-	- colour
+	- color
 	- priority
 	- dashed x - dashed line, length of dashes / spaces in x pixels
 	- dashed x,y - dashed line, x length of dashes / spaces in y pixels
-	- dashedcolour second (background) colour of a dashed line
+	- dashedcolor second (background) color of a dashed line
 4. linemod attributes
 	- all line attributes
 	- mode ('over' or 'under')
@@ -24,7 +24,7 @@
 	  x% - the size is <x> percent of modified way
 	  If the size is <= 1 the minimum size of 1 is used.
 5. area attributes
-	- colour
+	- color
 	- priority
 	- closed (true or false - when true the area style is ignored for unclosed ways)
 6. icon attributes
@@ -40,7 +40,7 @@
 first the best matching area rule is searched and the best matching line rule is
 connected with it. They need not have the same key/value pair.
 
-The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+The colors can consist of the two components - name and hex code (e.g. water#0000ff).
 If both are given, the color name is introduced in preferences with that value. If only
 code is given (e.g. #0000ff), it is used directly. If only name is given, either user
 modified preferences or previous value is used. The 6 hex digit color code can also
@@ -49,7 +49,7 @@
 Linemod's are drawn over or under the line they are associated with and modify the
 appearance. There can be multiple linemod's for one way (contrary to line styles,
 where only one applies). When drawn over a way either a very small width must be choosen
-or an alpha value must be used for the colour field (otherwise the original way is
+or an alpha value must be used for the color field (otherwise the original way is
 not visible). When the mod is under the way, then it must be wide enough to be visible
 on the sides of the way or the waystyles itself must use alpha channel (which may
 look strange).
@@ -129,63 +129,63 @@
 	</rule>
 	<rule>
 		<condition k="bridge" b="yes"/>
-		<linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
+		<linemod mode="over" width="+4" color="bridge#00008080" dashed="false"/>
 		<icon annotate="true" src="vehicle/viaduct.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 	<rule>
 		<condition k="bridge" b="no"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000" priority="-50000"/>
+		<line width="2" realwidth="5" dashed="true" color="deprecated#ff0000" priority="-50000"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 	<rule>
 		<condition k="bridge" v="viaduct"/>
-		<linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
+		<linemod mode="over" width="+4" color="bridge#00008080" dashed="false"/>
 		<icon annotate="true" src="vehicle/viaduct.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 	<rule>
 		<condition k="bridge" v="aqueduct"/>
-		<linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
+		<linemod mode="over" width="+4" color="bridge#00008080" dashed="false"/>
 		<icon annotate="true" src="nautical/aqueduct.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 	<rule>
 		<condition k="bridge" v="swing"/>
-		<linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
+		<linemod mode="over" width="+4" color="bridge#00008080" dashed="false"/>
 		<icon annotate="true" src="vehicle/viaduct.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 	<rule>
 		<condition k="tunnel" b="yes"/>
-		<linemod mode="over" width="+4" colour="bridge#00008080" dashed="false"/>
+		<linemod mode="over" width="+4" color="bridge#00008080" dashed="false"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 	<rule>
 		<condition k="tunnel" b="no"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
+		<line width="2" realwidth="5" dashed="true" color="deprecated#ff0000"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 	<rule>
 		<condition k="cutting" b="no"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
+		<line width="2" realwidth="5" dashed="true" color="deprecated#ff0000"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 	<rule>
 		<condition k="embankment" b="no"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
+		<line width="2" realwidth="5" dashed="true" color="deprecated#ff0000"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -202,21 +202,21 @@
 	</rule>
 	<rule>
 		<condition k="access" v="permissive"/>
-		<linemod mode="under" width="+2" colour="permissive#80ff80" dashed="2"/>
+		<linemod mode="under" width="+2" color="permissive#80ff80" dashed="2"/>
 		<icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 	<rule>
 		<condition k="access" v="private"/>
-		<linemod mode="under" width="+2" colour="private#ff8080" dashed="2"/>
+		<linemod mode="under" width="+2" color="private#ff8080" dashed="2"/>
 		<icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 	<rule>
 		<condition k="access" v="destination"/>
-		<linemod mode="under" width="+2" colour="destination#8080ff" dashed="2"/>
+		<linemod mode="under" width="+2" color="destination#8080ff" dashed="2"/>
 		<icon annotate="true" src="misc/no_icon.png" priority="-100"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -230,7 +230,7 @@
 	</rule>
 	<rule>
 		<condition k="bicycle" v="designated"/>
-		<!-- see trac #1559 <line width="1" realwidth="2" colour="bicycle#ff00ff"/>-->
+		<!-- see trac #1559 <line width="1" realwidth="2" color="bicycle#ff00ff"/>-->
 		<icon annotate="true" src="vehicle/restriction/bicycle-designated.png" priority="-100"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -244,7 +244,7 @@
 	</rule>
 	<rule>
 		<condition k="foot" v="designated"/>
-		<!-- see trac #1559 <line width="1" realwidth="1" colour="foot#00ff00"/>-->
+		<!-- see trac #1559 <line width="1" realwidth="1" color="foot#00ff00"/>-->
 		<icon annotate="true" src="vehicle/restriction/foot-designated.png" priority="-100"/>
 		<scale_min>1</scale_min>
 		<scale_max>10000</scale_max>
@@ -272,7 +272,7 @@
 	</rule>
 	<rule>
 		<condition k="horse" v="designated"/>
-		<!-- see trac #1559 <line width="1" realwidth="2" colour="horse#c08000"/>-->
+		<!-- see trac #1559 <line width="1" realwidth="2" color="horse#c08000"/>-->
 		<icon src="vehicle/restriction/horse-designated.png" priority="-100"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -385,7 +385,7 @@
 	<rule>
 		<condition k="barrier" v="bollard"/>
 		<icon annotate="true" src="vehicle/restriction/bollard.png"/>
-		<line width="3" colour="barrier#F0F050" dashed="3,9"/>
+		<line width="3" color="barrier#F0F050" dashed="3,9"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -398,8 +398,8 @@
 	<rule>
 		<condition k="barrier" v="hedge"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
-		<line width="3" colour="barrier#F0F050"/>
-		<area colour="barrier#F0F050" closed="true"/>
+		<line width="3" color="barrier#F0F050"/>
+		<area color="barrier#F0F050" closed="true"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -418,8 +418,8 @@
 	<rule>
 		<condition k="barrier" v="fence"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
-		<line width="3" colour="barrier#F0F050"/>
-		<area colour="barrier#F0F050" closed="true"/>
+		<line width="3" color="barrier#F0F050"/>
+		<area color="barrier#F0F050" closed="true"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -438,15 +438,15 @@
 	<rule>
 		<condition k="barrier" v="wall"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
-		<line width="3" colour="barrier#F0F050"/>
-		<area colour="barrier#F0F050" closed="true"/>
+		<line width="3" color="barrier#F0F050"/>
+		<area color="barrier#F0F050" closed="true"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 	<rule>
 		<condition k="barrier" v="toll_booth"/>
 		<icon annotate="true" src="vehicle/toll_booth.png"/>
-		<area colour="barrier#F0F050" closed="true"/>
+		<area color="barrier#F0F050" closed="true"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -459,8 +459,8 @@
 	<rule>
 		<condition k="barrier" v="city_wall"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
-		<line width="3" colour="barrier#F0F050"/>
-		<area colour="barrier#F0F050" closed="true"/>
+		<line width="3" color="barrier#F0F050"/>
+		<area color="barrier#F0F050" closed="true"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -473,8 +473,8 @@
 	<rule>
 		<condition k="barrier" v="retaining_wall"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
-		<line width="3" colour="barrier#F0F050"/>
-		<area colour="barrier#F0F050" closed="true"/>
+		<line width="3" color="barrier#F0F050"/>
+		<area color="barrier#F0F050" closed="true"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -487,8 +487,8 @@
 	<rule>
 		<condition k="barrier" v="block"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
-		<line width="3" colour="barrier#F0F050"/>
-		<area colour="barrier#F0F050" closed="true"/>
+		<line width="3" color="barrier#F0F050"/>
+		<area color="barrier#F0F050" closed="true"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -545,12 +545,12 @@
 
 	<rule>
 		<condition k="motorroad" v="yes"/>
-		<linemod mode="under" width="+4" colour="motorroad#0000c0"/>
+		<linemod mode="under" width="+4" color="motorroad#0000c0"/>
 	</rule>
 
 	<rule>
 		<condition k="highway" v="motorway"/>
-		<line width="3" realwidth="8" colour="motorway#809bc0"/>
+		<line width="3" realwidth="8" color="motorway#809bc0"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
@@ -558,7 +558,7 @@
 
 	<rule>
 		<condition k="highway" v="motorway_link"/>
-		<line width="3" realwidth="5" colour="motorway#809bc0"/>
+		<line width="3" realwidth="5" color="motorway#809bc0"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
@@ -566,7 +566,7 @@
 
 	<rule>
 		<condition k="highway" v="trunk"/>
-		<line width="3" realwidth="8" colour="trunk#7fc97f"/>
+		<line width="3" realwidth="8" color="trunk#7fc97f"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
@@ -574,7 +574,7 @@
 
 	<rule>
 		<condition k="highway" v="trunk_link"/>
-		<line width="3" realwidth="5" colour="trunk#7fc97f"/>
+		<line width="3" realwidth="5" color="trunk#7fc97f"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
@@ -582,7 +582,7 @@
 
 	<rule>
 		<condition k="highway" v="primary"/>
-		<line width="3" realwidth="8" colour="primary#fb805f"/>
+		<line width="3" realwidth="8" color="primary#fb805f"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
@@ -590,7 +590,7 @@
 
 	<rule>
 		<condition k="highway" v="primary_link"/>
-		<line width="3" realwidth="5" colour="primary#fb805f"/>
+		<line width="3" realwidth="5" color="primary#fb805f"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
@@ -598,7 +598,7 @@
 
 	<rule>
 		<condition k="highway" v="secondary"/>
-		<line width="3" realwidth="6" colour="secondary#fdbf6f"/>
+		<line width="3" realwidth="6" color="secondary#fdbf6f"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>300000</scale_max>
@@ -606,7 +606,7 @@
 
 	<rule>
 		<condition k="highway" v="secondary_link"/>
-		<line width="3" realwidth="5" colour="secondary#fdbf6f"/>
+		<line width="3" realwidth="5" color="secondary#fdbf6f"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>300000</scale_max>
@@ -614,7 +614,7 @@
 
 		<rule>
 		<condition k="highway" v="tertiary"/>
-		<line width="2" realwidth="5" colour="tertiary#f7f496"/>
+		<line width="2" realwidth="5" color="tertiary#f7f496"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -622,7 +622,7 @@
 
 	<rule>
 		<condition k="highway" v="unclassified"/>
-		<line width="2" realwidth="5" colour="street#c0c0c0"/>
+		<line width="2" realwidth="5" color="street#c0c0c0"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -630,7 +630,7 @@
 
 	<rule>
 		<condition k="highway" v="road"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
+		<line width="2" realwidth="5" dashed="true" color="deprecated#ff0000"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -638,7 +638,7 @@
 
 	<rule>
 		<condition k="highway" v="unsurfaced"/>
-		<line width="1" realwidth="3" colour="street#c0c0c0"/>
+		<line width="1" realwidth="3" color="street#c0c0c0"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -646,7 +646,7 @@
 
 	<rule>
 		<condition k="highway" v="track"/>
-		<line width="1" realwidth="3" colour="highway_track#006600" priority="-10000"/>
+		<line width="1" realwidth="3" color="highway_track#006600" priority="-10000"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>20000</scale_max>
@@ -654,7 +654,7 @@
 
 	<rule>
 		<condition k="highway" v="residential"/>
-		<line width="2" realwidth="5" colour="street#c0c0c0"/>
+		<line width="2" realwidth="5" color="street#c0c0c0"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -662,7 +662,7 @@
 
 	<rule>
 		<condition k="highway" v="living_street"/>
-		<line width="2" realwidth="3" colour="street#c0c0c0" dashed="9" dashedcolour="livingdashed#00ff00" />
+		<line width="2" realwidth="3" color="street#c0c0c0" dashed="9" dashedcolor="livingdashed#00ff00" />
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -670,7 +670,7 @@
 
 	<rule>
 		<condition k="highway" v="service"/>
-		<line width="1" realwidth="3" colour="service#809bc0"/>
+		<line width="1" realwidth="3" color="service#809bc0"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>20000</scale_max>
@@ -678,7 +678,7 @@
 
 	<rule>
 		<condition k="highway" v="bridleway"/>
-		<line width="1" realwidth="2" colour="horse#c08000"/>
+		<line width="1" realwidth="2" color="horse#c08000"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -686,7 +686,7 @@
 
 	<rule>
 		<condition k="highway" v="cycleway"/>
-		<line width="1" realwidth="2" colour="bicycle#b100ff"/>
+		<line width="1" realwidth="2" color="bicycle#b100ff"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -694,7 +694,7 @@
 
 	<rule>
 		<condition k="highway" v="footway"/>
-		<line width="1" realwidth="1" colour="foot#00ff00"/>
+		<line width="1" realwidth="1" color="foot#00ff00"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>10000</scale_max>
@@ -702,7 +702,7 @@
 
 	<rule>
 		<condition k="highway" v="path"/>
-		<line width="1" realwidth="1" dashed="true" colour="foot#00ff00"/>
+		<line width="1" realwidth="1" dashed="true" color="foot#00ff00"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>10000</scale_max>
@@ -712,7 +712,7 @@
 	<rule>
 		<condition k="highway" v="path"/>
 		<condition k="bicycle" v="designated"/>
-		<line width="1" realwidth="2" colour="bicycle#b100ff" priority="100"/>
+		<line width="1" realwidth="2" color="bicycle#b100ff" priority="100"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -720,7 +720,7 @@
 	<rule>
 		<condition k="highway" v="path"/>
 		<condition k="foot" v="designated"/>
-		<line width="1" realwidth="1" colour="foot#00ff00" priority="100"/>
+		<line width="1" realwidth="1" color="foot#00ff00" priority="100"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -729,15 +729,15 @@
 		<condition k="highway" v="path"/>
 		<condition k="bicycle" v="designated"/>
 		<condition k="foot" v="designated"/>
-		<line width="1" realwidth="2" colour="bicycle#b100ff" dashedcolour="foot#00ff00" dashed="14,14" priority="200"/>
+		<line width="1" realwidth="2" color="bicycle#b100ff" dashedcolor="foot#00ff00" dashed="14,14" priority="200"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 	
 	<rule>
 		<condition k="highway" v="pedestrian"/>
-		<line width="3" realwidth="5" colour="foot#00ff00"/>
-		<area colour="foot#00ff00" closed="true"/>
+		<line width="3" realwidth="5" color="foot#00ff00"/>
+		<area color="foot#00ff00" closed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>10000</scale_max>
@@ -745,7 +745,7 @@
 
 	<rule>
 		<condition k="highway" v="steps"/>
-		<line width="1" realwidth="1" dashed="1" colour="foot#00ff00"/>
+		<line width="1" realwidth="1" dashed="1" color="foot#00ff00"/>
 		<icon annotate="true" src="transport/steps.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>10000</scale_max>
@@ -753,7 +753,7 @@
 
 	<rule>
 		<condition k="highway" v="bus_guideway"/>
-		<line width="1" colour="rail#404040" dashed="true"/>
+		<line width="1" color="rail#404040" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>10000</scale_max>
@@ -839,7 +839,7 @@
 
 	<rule>
 		<condition k="highway" v="services"/>
-		<area colour="services#c0c0c0"/>
+		<area color="services#c0c0c0"/>
 		<icon annotate="true" src="vehicle/services.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -847,7 +847,7 @@
 
 	<rule>
 		<condition k="highway" v="ford"/>
-		<line width="2" realwidth="5" colour="ford#ff0000"/>
+		<line width="2" realwidth="5" color="ford#ff0000"/>
 		<icon annotate="true" src="vehicle/ford.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -862,7 +862,7 @@
 
 	<rule>
 		<condition k="highway" v="turning_circle"/>
-		<area colour="turningcircle#c0c0c0"/>
+		<area color="turningcircle#c0c0c0"/>
 		<icon annotate="true" src="vehicle/turning_circle.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -877,7 +877,7 @@
 
 	<rule>
 		<condition k="highway" v="construction"/>
-		<line width="2" realwidth="5" colour="construction#ffff00" dashed="true" priority="10"/>
+		<line width="2" realwidth="5" color="construction#ffff00" dashed="true" priority="10"/>
 		<icon src="misc/construction.png" priority="10"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -886,7 +886,7 @@
 	<rule>
 		<condition k="highway" v="emergency_access_point"/>
 		<icon src="service/emergency_access_point.png"/>
-		<area colour="emergency_access_point#c0c0c0"/>
+		<area color="emergency_access_point#c0c0c0"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -895,7 +895,7 @@
 
 	<rule>
 		<condition k="junction" v="roundabout"/>
-		<area colour="roundabout#eeeeee" closed="true"/>
+		<area color="roundabout#eeeeee" closed="true"/>
 		<!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -906,7 +906,7 @@
 
 	<rule>
 		<condition k="cycleway" v="lane"/>
-		<linemod width="+0" mode="over" colour="bicycle#b100ff" dashed="8,14"/>
+		<linemod width="+0" mode="over" color="bicycle#b100ff" dashed="8,14"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -914,7 +914,7 @@
 
 	<rule>
 		<condition k="cycleway" v="opposite_lane"/>
-		<linemod width="+0" mode="over" colour="bicycle#b100ff" dashed="8,14"/>
+		<linemod width="+0" mode="over" color="bicycle#b100ff" dashed="8,14"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -922,7 +922,7 @@
 
 	<rule>
 		<condition k="cycleway" v="track"/>
-		<linemod width="+0" mode="over" colour="bicycle#b100ff" dashed="14,14"/>
+		<linemod width="+0" mode="over" color="bicycle#b100ff" dashed="14,14"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -930,7 +930,7 @@
 
 	<rule>
 		<condition k="cycleway" v="opposite_track"/>
-		<linemod width="+0" mode="over" colour="bicycle#b100ff" dashed="14,14"/>
+		<linemod width="+0" mode="over" color="bicycle#b100ff" dashed="14,14"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -938,7 +938,7 @@
 
 	<rule>
 		<condition k="cycleway" v="opposite"/>
-		<linemod width="+0" mode="over" colour="bicycle#b100ff" dashed="4,10"/>
+		<linemod width="+0" mode="over" color="bicycle#b100ff" dashed="4,10"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -948,7 +948,7 @@
 
 	<rule>
 		<condition k="tracktype" v="grade1"/>
-		<line width="1" realwidth="3" dashed="2" colour="highway_track#006600"/>
+		<line width="1" realwidth="3" dashed="2" color="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -956,7 +956,7 @@
 
 	<rule>
 		<condition k="tracktype" v="grade2"/>
-		<line width="1" realwidth="3" dashed="4" colour="highway_track#006600"/>
+		<line width="1" realwidth="3" dashed="4" color="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -964,7 +964,7 @@
 
 	<rule>
 		<condition k="tracktype" v="grade3"/>
-		<line width="1" realwidth="3" dashed="6" colour="highway_track#006600"/>
+		<line width="1" realwidth="3" dashed="6" color="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -972,7 +972,7 @@
 
 	<rule>
 		<condition k="tracktype" v="grade4"/>
-		<line width="1" realwidth="3" dashed="8" colour="highway_track#006600"/>
+		<line width="1" realwidth="3" dashed="8" color="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -980,7 +980,7 @@
 
 	<rule>
 		<condition k="tracktype" v="grade5"/>
-		<line width="1" realwidth="3" dashed="10" colour="highway_track#006600"/>
+		<line width="1" realwidth="3" dashed="10" color="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -990,7 +990,7 @@
 
 	<rule>
 		<condition k="waterway" v="river"/>
-		<line width="2" realwidth="5" colour="water#0000ff"/>
+		<line width="2" realwidth="5" color="water#0000ff"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
@@ -998,8 +998,8 @@
 
 	<rule>
 		<condition k="waterway" v="riverbank"/>
-		<line width="1" colour="riverbank#0000cf" priority="10000"/>
-		<area colour="riverbank#0000cf" priority="10000"/>
+		<line width="1" color="riverbank#0000cf" priority="10000"/>
+		<area color="riverbank#0000cf" priority="10000"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1007,7 +1007,7 @@
 
 	<rule>
 		<condition k="waterway" v="canal"/>
-		<line width="2" colour="water#0000ff"/>
+		<line width="2" color="water#0000ff"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
@@ -1015,7 +1015,7 @@
 
 	<rule>
 		<condition k="waterway" v="stream"/>
-		<line width="1" colour="stream#6600cc"/>
+		<line width="1" color="stream#6600cc"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1023,14 +1023,14 @@
 
 	<rule>
 		<condition k="waterway" v="ditch"/>
-		<line width="1" colour="water#0000ff"/>
+		<line width="1" color="water#0000ff"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 	<rule>
 		<condition k="waterway" v="drain"/>
-		<line width="1" colour="water#0000ff"/>
+		<line width="1" color="water#0000ff"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1038,7 +1038,7 @@
 
 	<rule>
 		<condition k="waterway" v="dock"/>
-		<area colour="dock#0000cf"/>
+		<area color="dock#0000cf"/>
 		<icon annotate="true" src="nautical/boatyard.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1061,7 +1061,7 @@
 	<rule>
 		<condition k="waterway" v="boatyard"/>
 		<icon annotate="true" src="nautical/boatyard.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1090,7 +1090,7 @@
 	<rule>
 		<condition k="waterway" v="weir"/>
 		<icon annotate="true" src="nautical/weir.png"/>
-		<line width="2" colour="manmade#d8d8d8"/>
+		<line width="2" color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1098,7 +1098,7 @@
 	<rule>
 		<condition k="waterway" v="rapids"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
-		<line width="2" colour="rapids#8080ff"/>
+		<line width="2" color="rapids#8080ff"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1106,8 +1106,8 @@
 	<rule>
 		<condition k="waterway" v="dam"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
-		<line width="2" colour="manmade#d8d8d8"/>
-		<area colour="manmade#d8d8d8"/>
+		<line width="2" color="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1115,7 +1115,7 @@
 	<rule>
 		<condition k="waterway" v="waterfall"/>
 		<icon annotate="true" src="nautical/waterfall.png"/>
-		<line width="2" colour="manmade#d8d8d8"/>
+		<line width="2" color="manmade#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>
@@ -1125,7 +1125,7 @@
 
 	<rule>
 		<condition k="railway" v="station"/>
-		<area colour="railwaypoint#f7efb7"/>
+		<area color="railwaypoint#f7efb7"/>
 		<icon annotate="true" src="transport/railway_station.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1140,7 +1140,7 @@
 
 	<rule>
 		<condition k="railway" v="tram_station"/>
-		<area colour="railwaypoint#f7efb7"/>
+		<area color="railwaypoint#f7efb7"/>
 		<icon annotate="true" src="transport/railway_station.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1155,7 +1155,7 @@
 
 	<rule>
 		<condition k="railway" v="subway_entrance"/>
-		<area colour="railwaypoint#f7efb7"/>
+		<area color="railwaypoint#f7efb7"/>
 		<icon annotate="true" src="transport/underground.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1163,7 +1163,7 @@
 
 	<rule>
 		<condition k="railway" v="crossing"/>
-		<area colour="railwaypoint#f7efb7"/>
+		<area color="railwaypoint#f7efb7"/>
 		<icon annotate="true" src="vehicle/crossing_small.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1171,7 +1171,7 @@
 
 	<rule>
 		<condition k="railway" v="level_crossing"/>
-		<area colour="railwaypoint#f7efb7"/>
+		<area color="railwaypoint#f7efb7"/>
 		<icon annotate="true" src="vehicle/crossing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1179,7 +1179,7 @@
 
 	<rule>
 		<condition k="railway" v="rail"/>
-		<line width="2" colour="rail#404040" dashed="true" dashedcolour="raildashed#ffffff"/>
+		<line width="2" color="rail#404040" dashed="true" dashedcolor="raildashed#ffffff"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
@@ -1188,8 +1188,8 @@
 	<rule>
 		<condition k="railway" v="tram"/>
 		<!-- prefer way types over tram - draw tram as overlay in joined cases -->
-		<line width="1" colour="otherrail#808080" dashed="true" priority="-10000"/>
-		<linemod mode="over" width="1" colour="railover#202020" dashed="true"/>
+		<line width="1" color="otherrail#808080" dashed="true" priority="-10000"/>
+		<linemod mode="over" width="1" color="railover#202020" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1197,7 +1197,7 @@
 
 	<rule>
 		<condition k="railway" v="light_rail"/>
-		<line width="2" colour="otherrail#808080" dashed="true"/>
+		<line width="2" color="otherrail#808080" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1205,7 +1205,7 @@
 
 	<rule>
 		<condition k="railway" v="subway"/>
-		<line width="1" colour="subway#606060" dashed="true"/>
+		<line width="1" color="subway#606060" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1213,7 +1213,7 @@
 
 	<rule>
 		<condition k="railway" v="preserved"/>
-		<line width="1" colour="oldrail#404040" dashed="true"/>
+		<line width="1" color="oldrail#404040" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1223,8 +1223,8 @@
     <!-- -> normal display with line, linemod for combinations -->
 	<rule>
 		<condition k="railway" v="disused"/>
-		<line width="1" colour="oldrail#404040" dashed="true" priority="-10000"/>
-		<linemod mode="over" width="1" colour="oldrail#404040" dashed="true"/>
+		<line width="1" color="oldrail#404040" dashed="true" priority="-10000"/>
+		<linemod mode="over" width="1" color="oldrail#404040" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1234,8 +1234,8 @@
     <!-- -> normal display with line, linemod for combinations -->
 	<rule>
 		<condition k="railway" v="abandoned"/>
-		<line width="1" colour="oldrail#404040" dashed="true" priority="-10000"/>
-		<linemod mode="over" width="1" colour="oldrail#404040" dashed="true"/>
+		<line width="1" color="oldrail#404040" dashed="true" priority="-10000"/>
+		<linemod mode="over" width="1" color="oldrail#404040" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1243,7 +1243,7 @@
 
 	<rule>
 		<condition k="railway" v="narrow_gauge"/>
-		<line width="1" colour="rail#404040" dashed="true"/>
+		<line width="1" color="rail#404040" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1251,7 +1251,7 @@
 
 	<rule>
 		<condition k="railway" v="monorail"/>
-		<line width="1" colour="rail#404040" dashed="true"/>
+		<line width="1" color="rail#404040" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1260,7 +1260,7 @@
 	<rule>
 		<condition k="railway" v="turntable"/>
 		<icon annotate="true" src="transport/turntable.png"/>
-		<area colour="rail#404040"/>
+		<area color="rail#404040"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1268,7 +1268,7 @@
 	<rule>
 		<condition k="railway" v="buffer_stop"/>
 		<icon annotate="true" src="transport/buffer_stop.png"/>
-		<area colour="rail#404040"/>
+		<area color="rail#404040"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1276,15 +1276,15 @@
 	<rule>
 		<condition k="railway" v="platform"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
-		<line width="2" colour="rail#404040"/>
-		<area colour="rail#404040" closed="true"/>
+		<line width="2" color="rail#404040"/>
+		<area color="rail#404040" closed="true"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="railway" v="funicular"/>
-		<line width="1" colour="rail#404040" dashed="true"/>
+		<line width="1" color="rail#404040" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1315,8 +1315,8 @@
 
 	<rule>
 		<condition k="aeroway" v="aerodrome"/>
-		<line width="2" colour="aeroway#660000" dashed="true"/>
-		<area colour="aeroway#660000"/>
+		<line width="2" color="aeroway#660000" dashed="true"/>
+		<area color="aeroway#660000"/>
 		<icon annotate="true" src="transport/airport.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1324,7 +1324,7 @@
 
 	<rule>
 		<condition k="aeroway" v="terminal"/>
-		<area colour="terminal#bb0000"/>
+		<area color="terminal#bb0000"/>
 		<icon annotate="true" src="transport/airport/terminal.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1332,7 +1332,7 @@
 
 	<rule>
 		<condition k="aeroway" v="helipad"/>
-		<area colour="aeroway_dark#330000"/>
+		<area color="aeroway_dark#330000"/>
 		<icon annotate="true" src="transport/airport/helipad.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1340,7 +1340,7 @@
 
 	<rule>
 		<condition k="aeroway" v="runway"/>
-		<line width="3" colour="aeroway_dark#330000"/>
+		<line width="3" color="aeroway_dark#330000"/>
 		<icon annotate="true" src="transport/airport.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1348,7 +1348,7 @@
 
 	<rule>
 		<condition k="aeroway" v="taxiway"/>
-		<line width="2" colour="aeroway#660000"/>
+		<line width="2" color="aeroway#660000"/>
 		<icon annotate="true" src="transport/airport.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1356,7 +1356,7 @@
 
 	<rule>
 		<condition k="aeroway" v="apron"/>
-		<area colour="aeroway_light#990000"/>
+		<area color="aeroway_light#990000"/>
 		<icon annotate="true" src="transport/airport.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1380,7 +1380,7 @@
 
 	<rule>
 		<condition k="aerialway" v="cable_car"/>
-		<line width="1" colour="aerialway#663300" dashed="9"/>
+		<line width="1" color="aerialway#663300" dashed="9"/>
 		<icon annotate="true" src="transport/aerialway/cable_car.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1388,7 +1388,7 @@
 
 	<rule>
 		<condition k="aerialway" v="gondola"/>
-		<line width="1" colour="aerialway#663300" dashed="9"/>
+		<line width="1" color="aerialway#663300" dashed="9"/>
 		<icon annotate="true" src="transport/aerialway/cable_car.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1396,7 +1396,7 @@
 
 	<rule>
 		<condition k="aerialway" v="chair_lift"/>
-		<line width="1" colour="aerialway#663300" dashed="6"/>
+		<line width="1" color="aerialway#663300" dashed="6"/>
 		<icon annotate="true" src="transport/aerialway/chair_lift.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1404,7 +1404,7 @@
 
 	<rule>
 		<condition k="aerialway" v="drag_lift"/>
-		<line width="1" colour="aerialway#663300" dashed="3"/>
+		<line width="1" color="aerialway#663300" dashed="3"/>
 		<icon annotate="true" src="transport/aerialway/drag_lift.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1412,7 +1412,7 @@
 
 	<rule>
 		<condition k="aerialway" v="station"/>
-		<area colour="aerialway#663300"/>
+		<area color="aerialway#663300"/>
 		<icon annotate="true" src="transport/aerialway/station.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1420,7 +1420,7 @@
 
 	<rule>
 		<condition k="aerialway" v="pylon"/>
-		<area colour="aerialway#663300"/>
+		<area color="aerialway#663300"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1430,8 +1430,8 @@
 
 	<rule>
 		<condition k="piste:difficulty" v="easy"/>
-		<line width="6" colour="piste_easy#0000ff"/>
-		<area colour="piste_easy#0000ff"/>
+		<line width="6" color="piste_easy#0000ff"/>
+		<area color="piste_easy#0000ff"/>
 		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -1439,8 +1439,8 @@
 
 	<rule>
 		<condition k="piste:difficulty" v="intermediate"/>
-		<line width="6" colour="piste_intermediate#ff0000"/>
-		<area colour="piste_intermediate#ff0000"/>
+		<line width="6" color="piste_intermediate#ff0000"/>
+		<area color="piste_intermediate#ff0000"/>
 		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -1448,8 +1448,8 @@
 
 	<rule>
 		<condition k="piste:difficulty" v="advanced"/>
-		<line width="6" colour="piste_advanced#606060"/>
-		<area colour="piste_advanced#606060"/>
+		<line width="6" color="piste_advanced#606060"/>
+		<area color="piste_advanced#606060"/>
 		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -1457,8 +1457,8 @@
 
 	<rule>
 		<condition k="piste:difficulty" v="expert"/>
-		<line width="6" colour="piste_expert#606060"/>
-		<area colour="piste_expert#606060"/>
+		<line width="6" color="piste_expert#606060"/>
+		<area color="piste_expert#606060"/>
 		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -1466,8 +1466,8 @@
 
 	<rule>
 		<condition k="piste:difficulty" v="freeride"/>
-		<line width="6" colour="piste_freeride#ffff00"/>
-		<area colour="piste_freeride#ffff00"/>
+		<line width="6" color="piste_freeride#ffff00"/>
+		<area color="piste_freeride#ffff00"/>
 		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>30000</scale_max>
@@ -1475,8 +1475,8 @@
 
 	<rule>
 		<condition k="piste:difficulty" v="novice"/>
-		<line width="6" colour="piste_novice#00ff00"/>
-		<area colour="piste_novice#00ff00"/>
+		<line width="6" color="piste_novice#00ff00"/>
+		<area color="piste_novice#00ff00"/>
 		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>300000</scale_max>
@@ -1487,7 +1487,7 @@
 	<rule>
 		<condition k="power" v="tower"/>
 		<icon annotate="true" src="misc/landmark/power/tower_small.png"/>
-		<area colour="power#eeeeee"/>
+		<area color="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1501,7 +1501,7 @@
 
 	<rule>
 		<condition k="power" v="line"/>
-		<line width="1" colour="power#eeeeee"/>
+		<line width="1" color="power#eeeeee"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1509,7 +1509,7 @@
 
 	<rule>
 		<condition k="power" v="minor_line"/>
-		<line width="1" colour="power#eeeeee"/>
+		<line width="1" color="power#eeeeee"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1518,7 +1518,7 @@
 	<rule>
 		<condition k="power" v="station"/>
 		<icon annotate="true" src="misc/landmark/power.png"/>
-		<area colour="power#eeeeee"/>
+		<area color="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1526,7 +1526,7 @@
 	<rule>
 		<condition k="power" v="sub_station"/>
 		<icon annotate="true" src="misc/landmark/power.png"/>
-		<area colour="power#eeeeee"/>
+		<area color="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1534,7 +1534,7 @@
 	<rule>
 		<condition k="power_source" v="wind"/>
 		<icon annotate="true" src="misc/landmark/power/wind.png"/>
-		<area colour="power#eeeeee"/>
+		<area color="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1542,7 +1542,7 @@
 	<rule>
 		<condition k="power_source" v="hydro"/>
 		<icon annotate="true" src="misc/landmark/power/hydro.png"/>
-		<area colour="power#eeeeee"/>
+		<area color="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1550,7 +1550,7 @@
 	<rule>
 		<condition k="power_source" v="fossil"/>
 		<icon annotate="true" src="misc/landmark/power/fossil.png"/>
-		<area colour="power#eeeeee"/>
+		<area color="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1558,7 +1558,7 @@
 	<rule>
 		<condition k="power_source" v="coal"/>
 		<icon annotate="true" src="misc/landmark/power/fossil.png"/>
-		<area colour="power#eeeeee"/>
+		<area color="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1566,7 +1566,7 @@
 	<rule>
 		<condition k="power_source" v="gas"/>
 		<icon annotate="true" src="misc/landmark/power/fossil.png"/>
-		<area colour="power#eeeeee"/>
+		<area color="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1574,7 +1574,7 @@
 	<rule>
 		<condition k="power_source" v="photovoltaic"/>
 		<icon annotate="true" src="misc/landmark/power/fossil.png"/>
-		<area colour="power#eeeeee"/>
+		<area color="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1582,7 +1582,7 @@
 	<rule>
 		<condition k="power_source" v="nuclear"/>
 		<icon annotate="true" src="misc/landmark/power/nuclear.png"/>
-		<area colour="power#eeeeee"/>
+		<area color="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1590,7 +1590,7 @@
 	<rule>
 		<condition k="power" v="generator"/>
 		<icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-		<area colour="power#eeeeee"/>
+		<area color="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1600,14 +1600,14 @@
 	<rule>
 		<condition k="man_made" v="beacon"/>
 		<icon annotate="true" src="misc/landmark/beacon.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="man_made" v="crane"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<icon annotate="true" src="misc/landmark/crane.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1616,7 +1616,7 @@
 	<rule>
 		<condition k="man_made" v="gasometer"/>
 		<icon annotate="true" src="misc/landmark/gasometer.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1624,15 +1624,15 @@
 	<rule>
 		<condition k="man_made" v="lighthouse"/>
 		<icon annotate="true" src="misc/landmark/lighthouse.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="man_made" v="pier"/>
-		<area colour="pier#660000" closed="true"/>
-		<line width="2" colour="pier#660000"/>
+		<area color="pier#660000" closed="true"/>
+		<line width="2" color="pier#660000"/>
 		<icon annotate="true" src="nautical/pier.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1640,7 +1640,7 @@
 
 	<rule>
 		<condition k="man_made" v="pipeline"/>
-		<line width="2" colour="pipeline#660000"/>
+		<line width="2" color="pipeline#660000"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1656,7 +1656,7 @@
 	<rule>
 		<condition k="man_made" v="reservoir_covered"/>
 		<icon annotate="true" src="misc/landmark/reservoir_covered.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1664,7 +1664,7 @@
 	<rule>
 		<condition k="man_made" v="surveillance"/>
 		<icon annotate="true" src="misc/surveillance.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1672,7 +1672,7 @@
 	<rule>
 		<condition k="man_made" v="survey_point"/>
 		<icon annotate="true" src="misc/landmark/survey_point.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1680,14 +1680,14 @@
 	<rule>
 		<condition k="man_made" v="tower"/>
 		<icon annotate="true" src="misc/landmark/tower.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="man_made" v="wastewater_plant"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<icon annotate="true" src="misc/landmark/wastewater_plant.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1696,7 +1696,7 @@
 	<rule>
 		<condition k="man_made" v="watermill"/>
 		<icon annotate="true" src="misc/landmark/watermill.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1704,7 +1704,7 @@
 	<rule>
 		<condition k="man_made" v="water_tower"/>
 		<icon annotate="true" src="misc/landmark/water_tower.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1712,7 +1712,7 @@
 	<rule>
 		<condition k="man_made" v="windmill"/>
 		<icon annotate="true" src="misc/landmark/windmill.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1720,7 +1720,7 @@
 	<rule>
 		<condition k="man_made" v="works"/>
 		<icon annotate="true" src="misc/landmark/works.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1728,7 +1728,7 @@
 	<rule>
 		<condition k="man_made" v="water_works"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
-		<area colour="manmade#d8d8d8"/>
+		<area color="manmade#d8d8d8"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1738,7 +1738,7 @@
 	<rule>
 		<condition k="leisure" v="sports_centre"/>
 		<icon annotate="true" src="sport/centre.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1746,7 +1746,7 @@
 	<rule>
 		<condition k="leisure" v="golf_course"/>
 		<icon annotate="true" src="sport/golf.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1754,7 +1754,7 @@
 	<rule>
 		<condition k="leisure" v="stadium"/>
 		<icon annotate="true" src="sport/stadium.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1762,7 +1762,7 @@
 	<rule>
 		<condition k="leisure" v="track"/>
 		<icon annotate="true" src="sport/track.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1770,7 +1770,7 @@
 	<rule>
 		<condition k="leisure" v="pitch"/>
 		<icon annotate="true" src="sport/pitch.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1778,7 +1778,7 @@
 	<rule>
 		<condition k="leisure" v="water_park"/>
 		<icon annotate="true" src="leisure/water_park.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1786,7 +1786,7 @@
 	<rule>
 		<condition k="leisure" v="marina"/>
 		<icon annotate="true" src="nautical/marina.png"/>
-		<area colour="marina#0070cf"/>
+		<area color="marina#0070cf"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1794,7 +1794,7 @@
 	<rule>
 		<condition k="leisure" v="slipway"/>
 		<icon annotate="true" src="nautical/slipway.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1802,7 +1802,7 @@
 	<rule>
 		<condition k="leisure" v="fishing"/>
 		<icon annotate="true" src="sport/fishing.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1810,7 +1810,7 @@
 	<rule>
 		<condition k="leisure" v="nature_reserve"/>
 		<icon annotate="true" src="leisure/nature_reserve.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1818,7 +1818,7 @@
 	<rule>
 		<condition k="leisure" v="park"/>
 		<icon annotate="true" src="leisure/park.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1826,7 +1826,7 @@
 	<rule>
 		<condition k="leisure" v="playground"/>
 		<icon annotate="true" src="leisure/playground.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1834,7 +1834,7 @@
 	<rule>
 		<condition k="leisure" v="garden"/>
 		<icon annotate="true" src="leisure/garden.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1842,7 +1842,7 @@
 	<rule>
 		<condition k="leisure" v="common"/>
 		<icon annotate="true" src="leisure/common.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1850,7 +1850,7 @@
 	<rule>
 		<condition k="leisure" v="swimming_pool"/>
 		<icon annotate="true" src="sport/pool.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1858,7 +1858,7 @@
 	<rule>
 		<condition k="leisure" v="miniature_golf"/>
 		<icon annotate="true" src="sport/golf.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1866,7 +1866,7 @@
 	<rule>
 		<condition k="leisure" v="dog_park"/>
 		<icon annotate="true" src="leisure/dog.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1874,7 +1874,7 @@
 	<rule>
 		<condition k="leisure" v="ice_rink"/>
 		<icon annotate="true" src="sport/hockey.png"/>
-		<area colour="leisure#c7f1a3"/>
+		<area color="leisure#c7f1a3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1884,7 +1884,7 @@
 	<rule>
 		<condition k="amenity" v="pub"/>
 		<icon annotate="true" src="food/pub.png"/>
-		<area colour="amenity#ecba52"/>
+		<area color="amenity#ecba52"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1892,7 +1892,7 @@
 	<rule>
 		<condition k="amenity" v="biergarten"/>
 		<icon annotate="true" src="food/biergarten.png"/>
-		<area colour="amenity#ecba52"/>
+		<area color="amenity#ecba52"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1900,7 +1900,7 @@
 	<rule>
 		<condition k="amenity" v="nightclub"/>
 		<icon annotate="true" src="leisure/nightclub.png"/>
-		<area colour="amenity#ecba52"/>
+		<area color="amenity#ecba52"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1908,7 +1908,7 @@
 	<rule>
 		<condition k="amenity" v="stripclub"/>
 		<icon annotate="true" src="leisure/stripclub.png"/>
-		<area colour="amenity#ecba52"/>
+		<area color="amenity#ecba52"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1916,7 +1916,7 @@
 	<rule>
 		<condition k="amenity" v="brothel"/>
 		<icon annotate="true" src="leisure/stripclub.png"/>
-		<area colour="amenity#ecba52"/>
+		<area color="amenity#ecba52"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1924,7 +1924,7 @@
 	<rule>
 		<condition k="amenity" v="cafe"/>
 		<icon annotate="true" src="food/cafe.png"/>
-		<area colour="amenity#ecba52"/>
+		<area color="amenity#ecba52"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1932,7 +1932,7 @@
 	<rule>
 		<condition k="amenity" v="restaurant"/>
 		<icon annotate="true" src="food/restaurant.png"/>
-		<area colour="amenity#ecba52"/>
+		<area color="amenity#ecba52"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1940,7 +1940,7 @@
 	<rule>
 		<condition k="amenity" v="food_court"/>
 		<icon annotate="true" src="food/restaurant.png"/>
-		<area colour="amenity#ecba52"/>
+		<area color="amenity#ecba52"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1948,7 +1948,7 @@
 	<rule>
 		<condition k="amenity" v="fast_food"/>
 		<icon annotate="true" src="food/fastfood.png"/>
-		<area colour="amenity#ecba52"/>
+		<area color="amenity#ecba52"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1956,7 +1956,7 @@
 	<rule>
 		<condition k="amenity" v="bar"/>
 		<icon annotate="true" src="food/bar.png"/>
-		<area colour="amenity#ecba52"/>
+		<area color="amenity#ecba52"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1964,7 +1964,7 @@
 	<rule>
 		<condition k="amenity" v="ice_cream"/>
 		<icon annotate="true" src="food/icecream.png"/>
-		<area colour="amenity#ecba52"/>
+		<area color="amenity#ecba52"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1972,7 +1972,7 @@
 	<rule>
 		<condition k="parking" v="multi-storey"/>
 		<icon annotate="true" src="vehicle/parking/multi-storey.png" priority="10000"/>
-		<area colour="amenity_traffic#f7efb7"/>
+		<area color="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1980,7 +1980,7 @@
 	<rule>
 		<condition k="parking" v="underground"/>
 		<icon annotate="true" src="vehicle/parking/underground.png" priority="10000"/>
-		<area colour="amenity_traffic#f7efb7"/>
+		<area color="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1988,7 +1988,7 @@
 	<rule>
 		<condition k="parking" v="park_and_ride"/>
 		<icon annotate="true" src="vehicle/parking/park_ride.png" priority="10000"/>
-		<area colour="amenity_traffic#f7efb7"/>
+		<area color="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -1996,7 +1996,7 @@
 	<rule>
 		<condition k="parking" v="surface"/>
 		<icon annotate="true" src="vehicle/parking.png"/>
-		<area colour="amenity_traffic#f7efb7"/>
+		<area color="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2004,7 +2004,7 @@
 	<rule>
 		<condition k="amenity" v="parking"/>
 		<icon annotate="true" src="vehicle/parking.png"/>
-		<area colour="amenity_traffic#f7efb7"/>
+		<area color="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2012,7 +2012,7 @@
 	<rule>
 		<condition k="amenity" v="bicycle_parking"/>
 		<icon annotate="true" src="vehicle/parking/bicycle.png"/>
-		<area colour="amenity_traffic#f7efb7"/>
+		<area color="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2020,7 +2020,7 @@
 	<rule>
 		<condition k="amenity" v="bicycle_rental"/>
 		<icon annotate="true" src="vehicle/rental/bicycle.png"/>
-		<area colour="amenity_traffic#f7efb7"/>
+		<area color="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2028,7 +2028,7 @@
 	<rule>
 		<condition k="amenity" v="car_rental"/>
 		<icon annotate="true" src="vehicle/rental/car.png"/>
-		<area colour="amenity_traffic#f7efb7"/>
+		<area color="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2036,14 +2036,14 @@
 	<rule>
 		<condition k="amenity" v="car_sharing"/>
 		<icon annotate="true" src="vehicle/car_sharing.png"/>
-		<area colour="amenity_traffic#f7efb7"/>
+		<area color="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="amenity" v="car_wash"/>
-		<area colour="amenity_traffic#f7efb7"/>
+		<area color="amenity_traffic#f7efb7"/>
 		<icon annotate="true" src="vehicle/car_wash.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2052,7 +2052,7 @@
 	<rule>
 		<condition k="amenity" v="taxi"/>
 		<icon annotate="true" src="transport/taxi.png"/>
-		<area colour="amenity_traffic#f7efb7"/>
+		<area color="amenity_traffic#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2060,7 +2060,7 @@
 	<rule>
 		<condition k="amenity" v="fuel"/>
 		<icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-		<area colour="amenity_traffic#f7efb7" priority="10000"/>
+		<area color="amenity_traffic#f7efb7" priority="10000"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2075,7 +2075,7 @@
 	<rule>
 		<condition k="amenity" v="telephone"/>
 		<icon annotate="true" src="service/telephone.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2090,7 +2090,7 @@
 	<rule>
 		<condition k="amenity" v="emergency_phone"/>
 		<icon annotate="true" src="vehicle/emergency_phone.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2098,7 +2098,7 @@
 	<rule>
 		<condition k="amenity" v="toilets"/>
 		<icon annotate="true" src="service/toilets.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2106,7 +2106,7 @@
 	<rule>
 		<condition k="amenity" v="recycling"/>
 		<icon annotate="true" src="service/recycling.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2121,7 +2121,7 @@
 	<rule>
 		<condition k="amenity" v="public_building"/>
 		<icon annotate="true" src="service.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2129,7 +2129,7 @@
 	<rule>
 		<condition k="amenity" v="embassy"/>
 		<icon annotate="true" src="service.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2137,7 +2137,7 @@
 	<rule>
 		<condition k="amenity" v="townhall"/>
 		<icon annotate="true" src="service.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2145,7 +2145,7 @@
 	<rule>
 		<condition k="amenity" v="community_centre"/>
 		<icon annotate="true" src="service.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2153,7 +2153,7 @@
 	<rule>
 		<condition k="amenity" v="drinking_water"/>
 		<icon annotate="true" src="food/drinking_water.png"/>
-		<area colour="light_water#00005f"/>
+		<area color="light_water#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2161,7 +2161,7 @@
 	<rule>
 		<condition k="amenity" v="fountain"/>
 		<icon annotate="true" src="misc/landmark/spring.png"/>
-		<area colour="light_water#00005f"/>
+		<area color="light_water#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2260,7 +2260,7 @@
 	<rule>
 		<condition k="amenity" v="place_of_worship"/>
 		<icon annotate="true" src="religion.png" priority="-10000"/>
-		<area colour="amenity_light#f7efb7" priority="-10000"/>
+		<area color="amenity_light#f7efb7" priority="-10000"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2268,14 +2268,14 @@
 	<rule>
 		<condition k="amenity" v="grave_yard"/>
 		<icon annotate="true" src="rendering/landuse/cemetery.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="amenity" v="crematorium"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2284,7 +2284,7 @@
 	<rule>
 		<condition k="amenity" v="post_office"/>
 		<icon annotate="true" src="service/post_office.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2292,7 +2292,7 @@
 	<rule>
 		<condition k="amenity" v="post_box"/>
 		<icon annotate="true" src="service/post_box.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2300,7 +2300,7 @@
 	<rule>
 		<condition k="amenity" v="school"/>
 		<icon annotate="true" src="education/school.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2308,7 +2308,7 @@
 	<rule>
 		<condition k="amenity" v="university"/>
 		<icon annotate="true" src="education/university.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2316,7 +2316,7 @@
 	<rule>
 		<condition k="amenity" v="college"/>
 		<icon annotate="true" src="education/college.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2324,7 +2324,7 @@
 	<rule>
 		<condition k="amenity" v="kindergarten"/>
 		<icon annotate="true" src="education/kindergarten.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2332,14 +2332,14 @@
 	<rule>
 		<condition k="amenity" v="driving_school"/>
 		<icon annotate="true" src="education/driving_school.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="amenity" v="pharmacy"/>
-		<area colour="health#eeeeee"/>
+		<area color="health#eeeeee"/>
 		<icon annotate="true" src="health/pharmacy.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2347,7 +2347,7 @@
 
 	<rule>
 		<condition k="amenity" v="hospital"/>
-		<area colour="health#eeeeee"/>
+		<area color="health#eeeeee"/>
 		<icon annotate="true" src="health/hospital.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2355,7 +2355,7 @@
 
 	<rule>
 		<condition k="amenity" v="nursery"/>
-		<area colour="health#eeeeee"/>
+		<area color="health#eeeeee"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2364,14 +2364,14 @@
 	<rule>
 		<condition k="amenity" v="baby_hatch"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
-		<area colour="health#eeeeee"/>
+		<area color="health#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="amenity" v="doctors"/>
-		<area colour="health#eeeeee"/>
+		<area color="health#eeeeee"/>
 		<icon annotate="true" src="health/doctor.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2379,7 +2379,7 @@
 
 	<rule>
 		<condition k="amenity" v="dentist"/>
-		<area colour="health#eeeeee"/>
+		<area color="health#eeeeee"/>
 		<icon annotate="true" src="health/dentist.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2387,7 +2387,7 @@
 
 	<rule>
 		<condition k="amenity" v="veterinary"/>
-		<area colour="health#eeeeee"/>
+		<area color="health#eeeeee"/>
 		<icon annotate="true" src="health/veterinary.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2395,7 +2395,7 @@
 
 	<rule>
 		<condition k="amenity" v="library"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="shop/rental/library.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2403,7 +2403,7 @@
 
 	<rule>
 		<condition k="amenity" v="police"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="service/police.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2411,7 +2411,7 @@
 
 	<rule>
 		<condition k="amenity" v="fire_station"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="service/firebrigade.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2420,7 +2420,7 @@
 	<rule>
 		<condition k="amenity" v="bus_station"/>
 		<icon annotate="true" src="transport/bus.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2428,14 +2428,14 @@
 	<rule>
 		<condition k="amenity" v="ferry_terminal"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="amenity" v="theatre"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="leisure/theater.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2443,7 +2443,7 @@
 
 	<rule>
 		<condition k="amenity" v="cinema"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="leisure/cinema.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2451,7 +2451,7 @@
 
 	<rule>
 		<condition k="amenity" v="arts_centre"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="service/arts_centre.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2459,7 +2459,7 @@
 
 	<rule>
 		<condition k="amenity" v="courthouse"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="service/administration/court_of_law.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2467,7 +2467,7 @@
 
 	<rule>
 		<condition k="amenity" v="prison"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="service/administration/prison.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2475,7 +2475,7 @@
 
 	<rule>
 		<condition k="amenity" v="bank"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="money/bank.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2483,7 +2483,7 @@
 
 	<rule>
 		<condition k="amenity" v="bureau_de_change"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="money/exchange.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2491,7 +2491,7 @@
 
 	<rule>
 		<condition k="amenity" v="atm"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="money/atm.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2499,7 +2499,7 @@
 
 	<rule>
 		<condition k="amenity" v="bench"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="leisure/bench.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2507,7 +2507,7 @@
 
 	<rule>
 		<condition k="amenity" v="bbq"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="leisure/bbq.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2515,7 +2515,7 @@
 
 	<rule>
 		<condition k="amenity" v="shelter"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="accommodation/shelter.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2523,7 +2523,7 @@
 
 	<rule>
 		<condition k="amenity" v="hunting_stand"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="hunting_stand.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2531,7 +2531,7 @@
 
 	<rule>
 		<condition k="amenity" v="marketplace"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<icon annotate="true" src="place/marketplace.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2540,7 +2540,7 @@
 	<rule>
 		<condition k="amenity" v="wlan"/>
 		<icon annotate="true" src="wlan.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2555,7 +2555,7 @@
 	<rule>
 		<condition k="amenity" v="vending_machine"/>
 		<icon src="transport/ticket-machine.png" priority="-10"/>
-		<area colour="amenity_light#f7efb7"/>
+		<area color="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2565,7 +2565,7 @@
 	<rule>
 		<condition k="shop" v="supermarket"/>
 		<icon annotate="true" src="shop/supermarket.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2573,7 +2573,7 @@
 	<rule>
 		<condition k="shop" v="convenience"/>
 		<icon annotate="true" src="shop/supermarket.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2581,7 +2581,7 @@
 	<rule>
 		<condition k="shop" v="bakery"/>
 		<icon annotate="true" src="shop/groceries/bakery.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2589,7 +2589,7 @@
 	<rule>
 		<condition k="shop" v="butcher"/>
 		<icon annotate="true" src="shop/groceries/butcher.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2597,7 +2597,7 @@
 	<rule>
 		<condition k="shop" v="bicycle"/>
 		<icon annotate="true" src="sport/bicycle.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2605,7 +2605,7 @@
 	<rule>
 		<condition k="shop" v="doityourself"/>
 		<icon annotate="true" src="shop/diy_store.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2613,7 +2613,7 @@
 	<rule>
 		<condition k="shop" v="dry_cleaning"/>
 		<icon annotate="true" src="shop/laundry.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2621,7 +2621,7 @@
 	<rule>
 		<condition k="shop" v="laundry"/>
 		<icon annotate="true" src="shop/laundry.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2629,7 +2629,7 @@
 	<rule>
 		<condition k="shop" v="outdoor"/>
 		<icon annotate="true" src="shop/sports/outdoor.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2637,7 +2637,7 @@
 	<rule>
 		<condition k="shop" v="kiosk"/>
 		<icon annotate="true" src="shop/kiosk.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2645,7 +2645,7 @@
 	<rule>
 		<condition k="shop" v="alcohol"/>
 		<icon annotate="true" src="shop/beverages.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2653,7 +2653,7 @@
 	<rule>
 		<condition k="shop" v="beverages"/>
 		<icon annotate="true" src="shop/beverages.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2661,7 +2661,7 @@
 	<rule>
 		<condition k="shop" v="books"/>
 		<icon annotate="true" src="shop/rental/library.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2669,7 +2669,7 @@
 	<rule>
 		<condition k="shop" v="car"/>
 		<icon annotate="true" src="transport/car.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2677,7 +2677,7 @@
 	<rule>
 		<condition k="shop" v="car_dealer"/>
 		<icon annotate="true" src="transport/car.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2685,7 +2685,7 @@
 	<rule>
 		<condition k="shop" v="car_repair"/>
 		<icon annotate="true" src="transport/car.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2693,7 +2693,7 @@
 	<rule>
 		<condition k="shop" v="chemist"/>
 		<icon annotate="true" src="shop/chemist.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2701,7 +2701,7 @@
 	<rule>
 		<condition k="shop" v="clothes"/>
 		<icon annotate="true" src="shop/clothes.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2709,7 +2709,7 @@
 	<rule>
 		<condition k="shop" v="computer"/>
 		<icon annotate="true" src="shop/computer.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2717,7 +2717,7 @@
 	<rule>
 		<condition k="shop" v="cycle_repair"/>
 		<icon annotate="true" src="sport/bicycle.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2725,7 +2725,7 @@
 	<rule>
 		<condition k="shop" v="department_store"/>
 		<icon annotate="true" src="shop/mall.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2733,7 +2733,7 @@
 	<rule>
 		<condition k="shop" v="electronics"/>
 		<icon annotate="true" src="shop/electronics.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2741,7 +2741,7 @@
 	<rule>
 		<condition k="shop" v="furniture"/>
 		<icon annotate="true" src="shop/furniture.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2749,7 +2749,7 @@
 	<rule>
 		<condition k="shop" v="florist"/>
 		<icon annotate="true" src="shop/florist.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2757,7 +2757,7 @@
 	<rule>
 		<condition k="shop" v="groceries"/>
 		<icon annotate="true" src="shop/groceries/fruits.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2765,7 +2765,7 @@
 	<rule>
 		<condition k="shop" v="garden_centre"/>
 		<icon annotate="true" src="shop/garden_centre.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2773,7 +2773,7 @@
 	<rule>
 		<condition k="shop" v="hairdresser"/>
 		<icon annotate="true" src="shop/hairdresser.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2781,7 +2781,7 @@
 	<rule>
 		<condition k="shop" v="hardware"/>
 		<icon annotate="true" src="shop/diy_store.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2789,7 +2789,7 @@
 	<rule>
 		<condition k="shop" v="hifi"/>
 		<icon annotate="true" src="shop/hifi.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2797,7 +2797,7 @@
 	<rule>
 		<condition k="shop" v="jewelry"/>
 		<icon annotate="true" src="shop/jewelry.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2805,7 +2805,7 @@
 	<rule>
 		<condition k="shop" v="mall"/>
 		<icon annotate="true" src="shop/mall.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2813,7 +2813,7 @@
 	<rule>
 		<condition k="shop" v="motorcycle"/>
 		<icon annotate="true" src="vehicle/motorbike.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2821,7 +2821,7 @@
 	<rule>
 		<condition k="shop" v="newsagent"/>
 		<icon annotate="true" src="shop/kiosk.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2829,7 +2829,7 @@
 	<rule>
 		<condition k="shop" v="organic"/>
 		<icon annotate="true" src="shop/groceries/fruits.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2837,7 +2837,7 @@
 	<rule>
 		<condition k="shop" v="optician"/>
 		<icon annotate="true" src="shop/optician.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2845,7 +2845,7 @@
 	<rule>
 		<condition k="shop" v="shoes"/>
 		<icon annotate="true" src="shop/shoes.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2853,7 +2853,7 @@
 	<rule>
 		<condition k="shop" v="sports"/>
 		<icon annotate="true" src="sport/multi.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2861,7 +2861,7 @@
 	<rule>
 		<condition k="shop" v="stationery"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2869,7 +2869,7 @@
 	<rule>
 		<condition k="shop" v="tailor"/>
 		<icon annotate="true" src="shop/tailor.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2877,7 +2877,7 @@
 	<rule>
 		<condition k="shop" v="travel_agency"/>
 		<icon annotate="true" src="place/island.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2885,7 +2885,7 @@
 	<rule>
 		<condition k="shop" v="toys"/>
 		<icon annotate="true" src="shop/toys.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2893,7 +2893,7 @@
 	<rule>
 		<condition k="shop" v="video"/>
 		<icon annotate="true" src="shop/video.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2902,7 +2902,7 @@
 	<rule>
 		<condition k="shop" v="shopping_centre"/>
 		<icon annotate="true" src="shop/mall.png"/>
-		<area colour="shop#00005f"/>
+		<area color="shop#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2912,7 +2912,7 @@
 	<rule>
 		<condition k="tourism" v="hotel"/>
 		<icon annotate="true" src="accommodation.png"/>
-		<area colour="hotel#e1a0a2"/>
+		<area color="hotel#e1a0a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2920,7 +2920,7 @@
 	<rule>
 		<condition k="tourism" v="motel"/>
 		<icon annotate="true" src="accommodation/motel.png"/>
-		<area colour="hotel#e1a0a2"/>
+		<area color="hotel#e1a0a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2928,7 +2928,7 @@
 	<rule>
 		<condition k="tourism" v="guest_house"/>
 		<icon annotate="true" src="accommodation/guest_house.png"/>
-		<area colour="hotel#e1a0a2"/>
+		<area color="hotel#e1a0a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2936,7 +2936,7 @@
 	<rule>
 		<condition k="tourism" v="hostel"/>
 		<icon annotate="true" src="accommodation/hostel.png"/>
-		<area colour="hotel#e1a0a2"/>
+		<area color="hotel#e1a0a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2944,7 +2944,7 @@
 	<rule>
 		<condition k="tourism" v="chalet"/>
 		<icon annotate="true" src="accommodation/chalet.png"/>
-		<area colour="hotel#e1a0a2"/>
+		<area color="hotel#e1a0a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2952,7 +2952,7 @@
 	<rule>
 		<condition k="tourism" v="alpine_hut"/>
 		<icon annotate="true" src="accommodation/alpine_hut.png"/>
-		<area colour="hotel#e1a0a2"/>
+		<area color="hotel#e1a0a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2960,7 +2960,7 @@
 	<rule>
 		<condition k="tourism" v="camp_site"/>
 		<icon annotate="true" src="accommodation/camping.png"/>
-		<area colour="hotel#e1a0a2"/>
+		<area color="hotel#e1a0a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2968,7 +2968,7 @@
 	<rule>
 		<condition k="tourism" v="caravan_site"/>
 		<icon annotate="true" src="accommodation/camping/caravan.png"/>
-		<area colour="hotel#e1a0a2"/>
+		<area color="hotel#e1a0a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2976,7 +2976,7 @@
 	<rule>
 		<condition k="tourism" v="picnic_site"/>
 		<icon annotate="true" src="leisure/picnic.png"/>
-		<area colour="tourism#e180a2"/>
+		<area color="tourism#e180a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2984,7 +2984,7 @@
 	<rule>
 		<condition k="tourism" v="viewpoint"/>
 		<icon annotate="true" src="sightseeing/viewpoint.png"/>
-		<area colour="tourism#e180a2"/>
+		<area color="tourism#e180a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -2992,7 +2992,7 @@
 	<rule>
 		<condition k="tourism" v="theme_park"/>
 		<icon annotate="true" src="leisure/theme_park.png"/>
-		<area colour="tourism#e180a2"/>
+		<area color="tourism#e180a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3000,7 +3000,7 @@
 	<rule>
 		<condition k="tourism" v="attraction"/>
 		<icon annotate="true" src="sightseeing.png"/>
-		<area colour="tourism#e180a2"/>
+		<area color="tourism#e180a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3008,7 +3008,7 @@
 	<rule>
 		<condition k="tourism" v="zoo"/>
 		<icon annotate="true" src="leisure/zoo.png"/>
-		<area colour="tourism#e180a2"/>
+		<area color="tourism#e180a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3016,8 +3016,8 @@
 	<rule>
 		<condition k="tourism" v="artwork"/>
 		<icon annotate="true" src="service/arts_centre.png"/>
-		<line width="2" colour="tourism#e180a2"/>
-		<area colour="tourism#e180a2"/>
+		<line width="2" color="tourism#e180a2"/>
+		<area color="tourism#e180a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3025,7 +3025,7 @@
 	<rule>
 		<condition k="tourism" v="museum"/>
 		<icon annotate="true" src="sightseeing/museum.png"/>
-		<area colour="tourism#e180a2"/>
+		<area color="tourism#e180a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3041,7 +3041,7 @@
 	<rule>
 		<condition k="information" v="office"/>
 		<icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
-		<area colour="tourism#e180a2"/>
+		<area color="tourism#e180a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3063,7 +3063,7 @@
 	<rule>
 		<condition k="tourism" v="information"/>
 		<icon annotate="true" src="misc/information.png"/>
-		<area colour="tourism#e180a2"/>
+		<area color="tourism#e180a2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3073,7 +3073,7 @@
 	<rule>
 		<condition k="historic" v="castle"/>
 		<icon annotate="true" src="sightseeing/castle.png"/>
-		<area colour="historic#663300"/>
+		<area color="historic#663300"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3081,7 +3081,7 @@
 	<rule>
 		<condition k="historic" v="monument"/>
 		<icon annotate="true" src="sightseeing/monument.png"/>
-		<area colour="historic#663300"/>
+		<area color="historic#663300"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3089,7 +3089,7 @@
 	<rule>
 		<condition k="historic" v="memorial"/>
 		<icon annotate="true" src="sightseeing/memorial.png"/>
-		<area colour="historic#663300"/>
+		<area color="historic#663300"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3097,7 +3097,7 @@
 	<rule>
 		<condition k="historic" v="archaeological_site"/>
 		<icon annotate="true" src="sightseeing/archaeological.png"/>
-		<area colour="historic#663300"/>
+		<area color="historic#663300"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3105,7 +3105,7 @@
 	<rule>
 		<condition k="historic" v="ruins"/>
 		<icon annotate="true" src="sightseeing/ruins.png"/>
-		<area colour="historic#663300"/>
+		<area color="historic#663300"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3113,7 +3113,7 @@
 	<rule>
 		<condition k="historic" v="battlefield"/>
 		<icon annotate="true" src="sightseeing/battlefield.png"/>
-		<area colour="historic#663300"/>
+		<area color="historic#663300"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3121,7 +3121,7 @@
 	<rule>
 		<condition k="geological" v="palaeontological_site"/>
 		<icon annotate="true" src="historic/palaeontological_site.png"/>
-		<area colour="historic#663300"/>
+		<area color="historic#663300"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3129,7 +3129,7 @@
 	<rule>
 		<condition k="historic" v="wayside_cross"/>
 		<icon annotate="true" src="religion/wayside_cross.png"/>
-		<area colour="historic#663300"/>
+		<area color="historic#663300"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3137,7 +3137,7 @@
 	<rule>
 		<condition k="historic" v="wayside_shrine"/>
 		<icon annotate="true" src="religion/wayside_shrine.png"/>
-		<area colour="historic#663300"/>
+		<area color="historic#663300"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3145,7 +3145,7 @@
 	<rule>
 		<condition k="historic" v="boundary_stone"/>
 		<icon annotate="true" src="historic/boundary_stone.png"/>
-		<area colour="historic#663300"/>
+		<area color="historic#663300"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3154,7 +3154,7 @@
 
 	<rule>
 		<condition k="landuse" v="farm"/>
-		<area colour="green#b1e0c2"/>
+		<area color="green#b1e0c2"/>
 		<icon annotate="true" src="misc/landmark/farm.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3162,7 +3162,7 @@
 
 	<rule>
 		<condition k="landuse" v="farmland"/>
-		<area colour="green#b1e0c2"/>
+		<area color="green#b1e0c2"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3170,7 +3170,7 @@
 
 	<rule>
 		<condition k="landuse" v="meadow"/>
-		<area colour="green#b1e0c2"/>
+		<area color="green#b1e0c2"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3178,7 +3178,7 @@
 
 	<rule>
 		<condition k="landuse" v="vineyard"/>
-		<area colour="green#b1e0c2"/>
+		<area color="green#b1e0c2"/>
 		<icon annotate="true" src="shop/groceries/fruits.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3186,14 +3186,14 @@
 
 	<rule>
 		<condition k="landuse" v="orchard"/>
-		<area colour="green#b1e0c2"/>
+		<area color="green#b1e0c2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="landuse" v="quarry"/>
-		<area colour="quarry#888888"/>
+		<area color="quarry#888888"/>
 		<icon src="misc/landmark/mine.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3201,7 +3201,7 @@
 
 	<rule>
 		<condition k="landuse" v="landfill"/>
-		<area colour="landfill#663300"/>
+		<area color="landfill#663300"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3209,7 +3209,7 @@
 
 	<rule>
 		<condition k="landuse" v="basin"/>
-		<area colour="basin#0000bf"/>
+		<area color="basin#0000bf"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3217,7 +3217,7 @@
 
 	<rule>
 		<condition k="landuse" v="reservoir"/>
-		<area colour="basin#0000bf"/>
+		<area color="basin#0000bf"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3225,7 +3225,7 @@
 
 	<rule>
 		<condition k="landuse" v="forest"/>
-		<area colour="forest#b1efc8"/>
+		<area color="forest#b1efc8"/>
 		<icon src="misc/landmark/trees.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3233,7 +3233,7 @@
 
 	<rule>
 		<condition k="landuse" v="allotments"/>
-		<area colour="green#b1e0c2"/>
+		<area color="green#b1e0c2"/>
 		<icon src="misc/landmark/plant.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3241,7 +3241,7 @@
 
 	<rule>
 		<condition k="landuse" v="grass"/>
-		<area colour="green#b1e0c2"/>
+		<area color="green#b1e0c2"/>
 		<icon src="misc/landmark/plant.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3249,7 +3249,7 @@
 
 	<rule>
 		<condition k="landuse" v="residential"/>
-		<area colour="residential#f0f0f0"/>
+		<area color="residential#f0f0f0"/>
 		<icon src="misc/landuse/residential.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3257,7 +3257,7 @@
 
 	<rule>
 		<condition k="landuse" v="farmyard"/>
-		<area colour="farmyard#f0f0f0"/>
+		<area color="farmyard#f0f0f0"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3266,7 +3266,7 @@
 
 	<rule>
 		<condition k="landuse" v="retail"/>
-		<area colour="retail#dbdbdb"/>
+		<area color="retail#dbdbdb"/>
 		<icon src="shop/mall.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3274,7 +3274,7 @@
 
 	<rule>
 		<condition k="landuse" v="commercial"/>
-		<area colour="retail#dbdbdb"/>
+		<area color="retail#dbdbdb"/>
 		<icon src="misc/landuse/commercial.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3282,7 +3282,7 @@
 
 	<rule>
 		<condition k="landuse" v="industrial"/>
-		<area colour="industrial#ecd8ff"/>
+		<area color="industrial#ecd8ff"/>
 		<icon src="misc/landmark/works.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3290,7 +3290,7 @@
 
 	<rule>
 		<condition k="landuse" v="brownfield"/>
-		<area colour="brownfield#ecba32"/>
+		<area color="brownfield#ecba32"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3298,7 +3298,7 @@
 
 	<rule>
 		<condition k="landuse" v="greenfield"/>
-		<area colour="greenfield#b1ec5c"/>
+		<area color="greenfield#b1ec5c"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3306,7 +3306,7 @@
 
 	<rule>
 		<condition k="landuse" v="railway"/>
-		<area colour="railland#888888"/>
+		<area color="railland#888888"/>
 		<icon src="transport/railway_station.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3314,8 +3314,8 @@
 
 	<rule>
 		<condition k="landuse" v="construction"/>
-		<area colour="construction#ffff00"/>
-		<line width="1" colour="construction#ffff00" dashed="true"/>
+		<area color="construction#ffff00"/>
+		<line width="1" color="construction#ffff00" dashed="true"/>
 		<icon src="misc/construction.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3323,7 +3323,7 @@
 
 	<rule>
 		<condition k="landuse" v="military"/>
-		<area colour="military#b62c2c"/>
+		<area color="military#b62c2c"/>
 		<icon src="vehicle/tank.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3331,7 +3331,7 @@
 
 	<rule>
 		<condition k="landuse" v="cemetery"/>
-		<area colour="cemetery#b1efc8"/>
+		<area color="cemetery#b1efc8"/>
 		<icon src="rendering/landuse/cemetery.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3339,7 +3339,7 @@
 
 	<rule>
 		<condition k="landuse" v="village_green"/>
-		<area colour="green#b1e0c2"/>
+		<area color="green#b1e0c2"/>
 		<icon src="leisure/common.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3347,7 +3347,7 @@
 
 	<rule>
 		<condition k="landuse" v="recreation_ground"/>
-		<area colour="green#b1e0c2"/>
+		<area color="green#b1e0c2"/>
 		<icon src="leisure/common.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3358,7 +3358,7 @@
 	<rule>
 		<condition k="military" v="airfield"/>
 		<icon src="transport/airport/airfield.png"/>
-		<area colour="military#b62c2c"/>
+		<area color="military#b62c2c"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3366,7 +3366,7 @@
 	<rule>
 		<condition k="military" v="bunker"/>
 		<icon src="misc/landmark/bunker.png"/>
-		<area colour="military#b62c2c"/>
+		<area color="military#b62c2c"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3374,7 +3374,7 @@
 	<rule>
 		<condition k="military" v="barracks"/>
 		<icon src="misc/no_icon.png"/>
-		<area colour="military#b62c2c"/>
+		<area color="military#b62c2c"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3382,7 +3382,7 @@
 	<rule>
 		<condition k="military" v="danger_area"/>
 		<icon src="misc/danger.png"/>
-		<area colour="military#b62c2c"/>
+		<area color="military#b62c2c"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3390,7 +3390,7 @@
 	<rule>
 		<condition k="military" v="range"/>
 		<icon src="misc/landmark/range.png"/>
-		<area colour="military#b62c2c"/>
+		<area color="military#b62c2c"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3400,14 +3400,14 @@
 	<rule>
 		<condition k="natural" v="spring"/>
 		<icon annotate="true" src="misc/landmark/spring.png"/>
-		<area colour="light_water#00005f"/>
+		<area color="light_water#00005f"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="natural" v="peak"/>
-		<area colour="peak#663300"/>
+		<area color="peak#663300"/>
 		<icon annotate="true" src="misc/landmark/peak_small.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3416,7 +3416,7 @@
 	<rule>
 		<condition k="natural" v="glacier"/>
 		<icon annotate="true" src="misc/landmark/glacier_small.png"/>
-		<area colour="glacier#ffffff"/>
+		<area color="glacier#ffffff"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3424,7 +3424,7 @@
 	<rule>
 		<condition k="natural" v="volcano"/>
 		<icon annotate="true" src="misc/landmark/volcano_small.png"/>
-		<area colour="volcano#5f0000"/>
+		<area color="volcano#5f0000"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3432,8 +3432,8 @@
 	<rule>
 		<condition k="natural" v="cliff"/>
 		<icon src="misc/no_icon.png"/>
-		<line width="2" colour="natural#002f00"/>
-		<area colour="natural#002f00" closed="true"/>
+		<line width="2" color="natural#002f00"/>
+		<area color="natural#002f00" closed="true"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3441,7 +3441,7 @@
 	<rule>
 		<condition k="natural" v="scree"/>
 		<icon src="misc/no_icon.png"/>
-		<area colour="natural#002f00"/>
+		<area color="natural#002f00"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3449,7 +3449,7 @@
 	<rule>
 		<condition k="natural" v="scrub"/>
 		<icon src="misc/no_icon.png"/>
-		<area colour="scrub#007000"/>
+		<area color="scrub#007000"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3457,7 +3457,7 @@
 	<rule>
 		<condition k="natural" v="fell"/>
 		<icon src="misc/no_icon.png"/>
-		<area colour="natural#002f00"/>
+		<area color="natural#002f00"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3465,7 +3465,7 @@
 	<rule>
 		<condition k="natural" v="heath"/>
 		<icon src="misc/no_icon.png"/>
-		<area colour="heath#ffffc0"/>
+		<area color="heath#ffffc0"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3473,7 +3473,7 @@
 	<rule>
 		<condition k="natural" v="wood"/>
 		<icon src="misc/landmark/trees.png"/>
-		<area colour="woodarea#008000"/>
+		<area color="woodarea#008000"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3481,7 +3481,7 @@
 	<rule>
 		<condition k="natural" v="wetland"/>
 		<icon src="misc/no_icon.png"/>
-		<area colour="marsh#4f4ff3"/>
+		<area color="marsh#4f4ff3"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3489,7 +3489,7 @@
 	<rule>
 		<condition k="natural" v="water"/>
 		<icon src="nautical/water.png"/>
-		<area colour="water#0000ff"/>
+		<area color="water#0000ff"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3497,7 +3497,7 @@
 	<rule>
 		<condition k="natural" v="coastline"/>
 		<icon src="misc/no_icon.png"/>
-		<line width="1" colour="water#0000ff"/>
+		<line width="1" color="water#0000ff"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3505,7 +3505,7 @@
 	<rule>
 		<condition k="natural" v="mud"/>
 		<icon src="misc/no_icon.png"/>
-		<area colour="mud#cba762"/>
+		<area color="mud#cba762"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3513,7 +3513,7 @@
 	<rule>
 		<condition k="natural" v="beach"/>
 		<icon src="misc/no_icon.png"/>
-		<area colour="beach#f8dba2"/>
+		<area color="beach#f8dba2"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3521,7 +3521,7 @@
 	<rule>
 		<condition k="natural" v="bay"/>
 		<icon src="misc/no_icon.png"/>
-		<area colour="natural#002f00"/>
+		<area color="natural#002f00"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3529,7 +3529,7 @@
 	<rule>
 		<condition k="natural" v="land"/>
 		<icon src="misc/no_icon.png"/>
-		<area colour="natural#002f00"/>
+		<area color="natural#002f00"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3537,7 +3537,7 @@
 	<rule>
 		<condition k="natural" v="cave_entrance"/>
 		<icon src="misc/no_icon.png"/>
-		<area colour="natural#002f00"/>
+		<area color="natural#002f00"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -3553,7 +3553,7 @@
 
 	<rule>
 		<condition k="route" v="bus"/>
-		<line width="1" colour="route#809bc0" dashed="true"/>
+		<line width="1" color="route#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3561,7 +3561,7 @@
 
 	<rule>
 		<condition k="route" v="ferry"/>
-		<line width="1" colour="route#809bc0" dashed="true"/>
+		<line width="1" color="route#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3569,7 +3569,7 @@
 
 	<rule>
 		<condition k="route" v="flight"/>
-		<line width="1" colour="route#809bc0" dashed="true"/>
+		<line width="1" color="route#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3577,7 +3577,7 @@
 
 	<rule>
 		<condition k="route" v="ncn"/>
-		<line width="1" colour="route#809bc0" dashed="true"/>
+		<line width="1" color="route#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3585,7 +3585,7 @@
 
 	<rule>
 		<condition k="route" v="subsea"/>
-		<line width="1" colour="route#809bc0" dashed="true"/>
+		<line width="1" color="route#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3593,7 +3593,7 @@
 
 	<rule>
 		<condition k="route" v="ski"/>
-		<line width="1" colour="route#809bc0" dashed="true"/>
+		<line width="1" color="route#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3601,7 +3601,7 @@
 
 	<rule>
 		<condition k="route" v="tour"/>
-		<line width="1" colour="route#809bc0" dashed="true"/>
+		<line width="1" color="route#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3609,7 +3609,7 @@
 
 	<rule>
 		<condition k="route" v="pub_crawl"/>
-		<line width="1" colour="route#809bc0" dashed="true"/>
+		<line width="1" color="route#809bc0" dashed="true"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3619,7 +3619,7 @@
 
 	<rule>
 		<condition k="boundary" v="national"/>
-		<line width="1" colour="boundary#FF6600" dashed="true" priority="-10"/>
+		<line width="1" color="boundary#FF6600" dashed="true" priority="-10"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3627,48 +3627,48 @@
 
 	<rule>
 		<condition k="admin_level" v="1"/>
-		<line width="5" colour="boundary#FF6600" dashed="true"/>
+		<line width="5" color="boundary#FF6600" dashed="true"/>
 	</rule>
 	<rule>
 		<condition k="admin_level" v="2"/>
-		<line width="5" colour="boundary#FF6600" dashed="true"/>
+		<line width="5" color="boundary#FF6600" dashed="true"/>
 	</rule>
 	<rule>
 		<condition k="admin_level" v="3"/>
-		<line width="4" colour="boundary#FF6600" dashed="true"/>
+		<line width="4" color="boundary#FF6600" dashed="true"/>
 	</rule>
 	<rule>
 		<condition k="admin_level" v="4"/>
-		<line width="4" colour="boundary#FF6600" dashed="true"/>
+		<line width="4" color="boundary#FF6600" dashed="true"/>
 	</rule>
 	<rule>
 		<condition k="admin_level" v="5"/>
-		<line width="3" colour="boundary#FF6600" dashed="true"/>
+		<line width="3" color="boundary#FF6600" dashed="true"/>
 	</rule>
 	<rule>
 		<condition k="admin_level" v="6"/>
-		<line width="3" colour="boundary#FF6600" dashed="true"/>
+		<line width="3" color="boundary#FF6600" dashed="true"/>
 	</rule>
 	<rule>
 		<condition k="admin_level" v="7"/>
-		<line width="2" colour="boundary#FF6600" dashed="true"/>
+		<line width="2" color="boundary#FF6600" dashed="true"/>
 	</rule>
 	<rule>
 		<condition k="admin_level" v="8"/>
-		<line width="2" colour="boundary#FF6600" dashed="true"/>
+		<line width="2" color="boundary#FF6600" dashed="true"/>
 	</rule>
 	<rule>
 		<condition k="admin_level" v="9"/>
-		<line width="1" colour="boundary#FF6600" dashed="true"/>
+		<line width="1" color="boundary#FF6600" dashed="true"/>
 	</rule>
 	<rule>
 		<condition k="admin_level" v="10"/>
-		<line width="1" colour="boundary#FF6600" dashed="true"/>
+		<line width="1" color="boundary#FF6600" dashed="true"/>
 	</rule>
 
 	<rule>
 		<condition k="boundary" v="administrative"/>
-		<line width="1" colour="boundary#FF6600" dashed="true" priority="-10"/>
+		<line width="1" color="boundary#FF6600" dashed="true" priority="-10"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3676,7 +3676,7 @@
 
 	<rule>
 		<condition k="boundary" v="civil"/>
-		<line width="1" colour="boundary#FF6600" dashed="true" priority="-10"/>
+		<line width="1" color="boundary#FF6600" dashed="true" priority="-10"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3684,7 +3684,7 @@
 
 	<rule>
 		<condition k="boundary" v="political"/>
-		<line width="1" colour="boundary#FF6600" dashed="true" priority="-10"/>
+		<line width="1" color="boundary#FF6600" dashed="true" priority="-10"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3692,7 +3692,7 @@
 
 	<rule>
 		<condition k="boundary" v="national_park"/>
-		<line width="1" colour="boundary#FF6600" dashed="true" priority="-10"/>
+		<line width="1" color="boundary#FF6600" dashed="true" priority="-10"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3702,7 +3702,7 @@
 
 	<rule>
 		<condition k="sport" v="9pin"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/10pin.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3710,7 +3710,7 @@
 
 	<rule>
 		<condition k="sport" v="10pin"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/10pin.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3718,7 +3718,7 @@
 
 	<rule>
 		<condition k="sport" v="athletics"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3726,7 +3726,7 @@
 
 	<rule>
 		<condition k="sport" v="australian_football"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/football.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3734,7 +3734,7 @@
 
 	<rule>
 		<condition k="sport" v="baseball"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/baseball.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3742,7 +3742,7 @@
 
 	<rule>
 		<condition k="sport" v="basketball"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/basketball.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3750,7 +3750,7 @@
 
 	<rule>
 		<condition k="sport" v="boules"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/boule.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3758,7 +3758,7 @@
 
 	<rule>
 		<condition k="sport" v="bowls"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/boule.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3766,7 +3766,7 @@
 
 	<rule>
 		<condition k="sport" v="canoe"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/canoe.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3774,7 +3774,7 @@
 
 	<rule>
 		<condition k="sport" v="chess"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/chess.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3782,7 +3782,7 @@
 
 	<rule>
 		<condition k="sport" v="climbing"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/climbing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3790,7 +3790,7 @@
 
 	<rule>
 		<condition k="sport" v="cricket"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/cricket.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3798,7 +3798,7 @@
 
 	<rule>
 		<condition k="sport" v="cricket_nets"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3806,7 +3806,7 @@
 
 	<rule>
 		<condition k="sport" v="croquet"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/croquet.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3814,7 +3814,7 @@
 
 	<rule>
 		<condition k="sport" v="cycling"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/cycling.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3822,7 +3822,7 @@
 
 	<rule>
 		<condition k="sport" v="dog_racing"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="leisure/dog.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3830,7 +3830,7 @@
 
 	<rule>
 		<condition k="sport" v="equestrian"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/riding.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3838,7 +3838,7 @@
 
 	<rule>
 		<condition k="sport" v="football"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/football.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3846,7 +3846,7 @@
 
 	<rule>
 		<condition k="sport" v="golf"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/golf.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3854,7 +3854,7 @@
 
 	<rule>
 		<condition k="sport" v="gymnastics"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/multi.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3862,7 +3862,7 @@
 
 	<rule>
 		<condition k="sport" v="hockey"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/hockey.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3870,7 +3870,7 @@
 
 	<rule>
 		<condition k="sport" v="horse_racing"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/riding.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3878,7 +3878,7 @@
 
 	<rule>
 		<condition k="sport" v="motor"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="vehicle/motorbike.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3886,7 +3886,7 @@
 
 	<rule>
 		<condition k="sport" v="multi"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/multi.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3894,7 +3894,7 @@
 
 	<rule>
 		<condition k="sport" v="pelota"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3902,7 +3902,7 @@
 
 	<rule>
 		<condition k="sport" v="racquet"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/racquetball.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3910,7 +3910,7 @@
 
 	<rule>
 		<condition k="sport" v="rugby"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/football.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3918,7 +3918,7 @@
 
 	<rule>
 		<condition k="sport" v="skating"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3926,7 +3926,7 @@
 
 	<rule>
 		<condition k="sport" v="skateboard"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/skateboard.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3934,7 +3934,7 @@
 
 	<rule>
 		<condition k="sport" v="soccer"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/soccer.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3942,7 +3942,7 @@
 
 	<rule>
 		<condition k="sport" v="swimming"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/pool.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3950,7 +3950,7 @@
 
 	<rule>
 		<condition k="sport" v="skiing"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/skiing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3958,7 +3958,7 @@
 
 	<rule>
 		<condition k="sport" v="table_tennis"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/table_tennis.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3966,7 +3966,7 @@
 
 	<rule>
 		<condition k="sport" v="tennis"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon src="sport/tennis.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3974,7 +3974,7 @@
 
 	<rule>
 		<condition k="sport" v="paintball"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3982,7 +3982,7 @@
 
 	<rule>
 		<condition k="sport" v="squash"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3990,7 +3990,7 @@
 
 	<rule>
 		<condition k="sport" v="shooting"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -3998,7 +3998,7 @@
 
 	<rule>
 		<condition k="sport" v="volleyball"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="sport/volleyball.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4006,7 +4006,7 @@
 
 	<rule>
 		<condition k="sport" v="beachvolleyball"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="sport/volleyball.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4014,7 +4014,7 @@
 
 	<rule>
 		<condition k="sport" v="bowling"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="sport/10pin.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4022,7 +4022,7 @@
 
 	<rule>
 		<condition k="sport" v="handball"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="sport/handball.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4030,7 +4030,7 @@
 
 	<rule>
 		<condition k="sport" v="rowing"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="sport/rowing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4038,7 +4038,7 @@
 
 	<rule>
 		<condition k="sport" v="sailing"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4046,7 +4046,7 @@
 
 	<rule>
 		<condition k="sport" v="diving"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="sport/diving.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4054,7 +4054,7 @@
 
 	<rule>
 		<condition k="sport" v="badminton"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4062,7 +4062,7 @@
 
 	<rule>
 		<condition k="sport" v="archery"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="sport/archery.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4070,7 +4070,7 @@
 
 	<rule>
 		<condition k="sport" v="fishing"/>
-		<area colour="sport#bde3cb"/>
+		<area color="sport#bde3cb"/>
 		<icon annotate="true" src="sport/fishing.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4084,7 +4084,7 @@
 
 	<rule>
 		<condition k="mountain_pass" b="yes"/>
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000"/>
+		<line width="2" realwidth="5" dashed="true" color="deprecated#ff0000"/>
 		<icon src="misc/landmark/mountain_pass.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -4094,21 +4094,21 @@
 	XXX - maybe it's possible to use linemod's here?
 	<rule>
 		<condition k="surface" v="paved"/>
-		<linemod mode="under" width="0" dashedcolour="#505050"/>
+		<linemod mode="under" width="0" dashedcolor="#505050"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 	<rule>
 		<condition k="surface" v="unpaved"/>
-		<linemod mode="under" width="0" dashedcolour="#301000"/>
+		<linemod mode="under" width="0" dashedcolor="#301000"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 	<rule>
 		<condition k="surface" v="gravel"/>
-		<linemod mode="under" width="0" dashedcolour="#100070"/>
+		<linemod mode="under" width="0" dashedcolor="#100070"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -4116,7 +4116,7 @@
 
 	<rule>
 		<condition k="surface" v="cobblestone"/>
-		<linemod mode="under" width="0" dashedcolour="#600060"/>
+		<linemod mode="under" width="0" dashedcolor="#600060"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
@@ -4132,7 +4132,7 @@
 	<rule>
 		<condition k="place" v="continent"/>
 		<icon annotate="true" src="place/settlement/capital.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
 	</rule>
@@ -4140,7 +4140,7 @@
 	<rule>
 		<condition k="place" v="country"/>
 		<icon annotate="true" src="place/settlement/capital.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
 	</rule>
@@ -4148,7 +4148,7 @@
 	<rule>
 		<condition k="place" v="state"/>
 		<icon annotate="true" src="place/settlement/capital.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
 	</rule>
@@ -4156,7 +4156,7 @@
 	<rule>
 		<condition k="place" v="region"/>
 		<icon annotate="true" src="place/settlement/capital.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
 	</rule>
@@ -4164,7 +4164,7 @@
 	<rule>
 		<condition k="place" v="county"/>
 		<icon annotate="true" src="place/settlement/capital.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
 	</rule>
@@ -4172,7 +4172,7 @@
 	<rule>
 		<condition k="place" v="city"/>
 		<icon annotate="true" src="place/settlement/city.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>200000000</scale_max>
 	</rule>
@@ -4180,7 +4180,7 @@
 	<rule>
 		<condition k="place" v="town"/>
 		<icon annotate="true" src="place/settlement/town.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -4188,7 +4188,7 @@
 	<rule>
 		<condition k="place" v="village"/>
 		<icon annotate="true" src="place/settlement/town.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -4196,7 +4196,7 @@
 	<rule>
 		<condition k="place" v="hamlet"/>
 		<icon annotate="true" src="place/settlement/town.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -4204,7 +4204,7 @@
 	<rule>
 		<condition k="place" v="suburb"/>
 		<icon annotate="true" src="place/settlement/town.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -4212,7 +4212,7 @@
 	<rule>
 		<condition k="place" v="locality"/>
 		<icon annotate="true" src="place/locality.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -4220,7 +4220,7 @@
 	<rule>
 		<condition k="place" v="island"/>
 		<icon annotate="true" src="place/island.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -4228,7 +4228,7 @@
 	<rule>
 		<condition k="place" v="islet"/>
 		<icon annotate="true" src="place/islet.png"/>
-		<area colour="place#8de3cb"/>
+		<area color="place#8de3cb"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -4236,7 +4236,7 @@
 	<!-- special display of unreviewed tiger data (USA) -->
 	<rule>
 		<condition k="tiger:reviewed" v="no"/>
-		<linemod mode="under" width="10" colour="#808000"/>
+		<linemod mode="under" width="10" color="#808000"/>
 	</rule>
 
 	<!-- lot's of "openGeoDB:..." tags can be found in germany -->
@@ -4289,14 +4289,14 @@
 	<rule>
 		<condition k="building"/>
 		<icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
-		<area colour="building#cb9999" priority="-10000"/>
+		<area color="building#cb9999" priority="-10000"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="area" b="yes"/>
-		<area colour="area#ffffff" priority="-10000"/>
+		<area color="area#ffffff" priority="-10000"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
 	</rule>
@@ -4317,28 +4317,28 @@
 
 	<rule>
 		<condition k="addr:interpolation" v="odd"/>
-		<line width="1" realwidth="1" dashed="true" colour="address#1C86EE"/>
+		<line width="1" realwidth="1" dashed="true" color="address#1C86EE"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="addr:interpolation" v="even"/>
-                <line width="1" realwidth="1" dashed="true" colour="address#1C86EE"/>
+                <line width="1" realwidth="1" dashed="true" color="address#1C86EE"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="addr:interpolation" v="all"/>
-                <line width="1" realwidth="1" dashed="true" colour="address#1C86EE"/>
+                <line width="1" realwidth="1" dashed="true" color="address#1C86EE"/>
 		<scale_min>1</scale_min>
 		<scale_max>40000</scale_max>
 	</rule>
 
         <rule>
                 <condition k="addr:interpolation" v="alphabetic"/>
-                <line width="1" realwidth="1" dashed="true" colour="address#1C86EE"/>
+                <line width="1" realwidth="1" dashed="true" color="address#1C86EE"/>
                 <scale_min>1</scale_min>
                 <scale_max>40000</scale_max>
         </rule>
@@ -4354,7 +4354,7 @@
     <rule> 
         <condition k="public_transport" v="platform"/> 
         <icon annotate="true" src="misc/no_icon.png"/>
-        <line width="1" realwidth="1" colour="service#809bc0" dashed="9" dashedcolour="livingdashed#00ff00" /> 
+        <line width="1" realwidth="1" color="service#809bc0" dashed="9" dashedcolor="livingdashed#00ff00" /> 
         <scale_min>1</scale_min> 
         <scale_max>50000</scale_max> 
     </rule> 
Index: styles/maxspeed/elemstyles.xml
===================================================================
--- styles/maxspeed/elemstyles.xml	(Revision 2929)
+++ styles/maxspeed/elemstyles.xml	(Arbeitskopie)
@@ -3,111 +3,111 @@
 
 	<rule>
 		<condition k="maxspeed" v="5"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
     
 	<rule>
 		<condition k="maxspeed" v="7"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
     
 	<rule>
 		<condition k="maxspeed" v="8"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
     
 	<rule>
 		<condition k="maxspeed" v="10"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
     
 	<rule>
 		<condition k="maxspeed" v="15"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
     
 	<rule>
 		<condition k="maxspeed" v="20"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
     
 	<rule>
 		<condition k="maxspeed" v="30"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
     
 	<rule>
 		<condition k="maxspeed" v="40"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
     
 	<rule>
 		<condition k="maxspeed" v="50"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
 
 	<rule>
 		<condition k="maxspeed" v="60"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
 
 	<rule>
 		<condition k="maxspeed" v="70"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
 
 	<rule>
 		<condition k="maxspeed" v="80"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
 
 	<rule>
 		<condition k="maxspeed" v="100"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
 
 	<rule>
 		<condition k="maxspeed" v="120"/>
-		<linemod mode="under" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
 
 	<rule>
         <!-- electronic traffic signs -->
 		<condition k="maxspeed" v="variable"/>
-		<linemod mode="under" dashed="yes" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" dashed="yes" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
 
 	<rule>
 		<condition k="maxspeed" v="walk"/>
-		<linemod mode="under" dashed="yes" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" dashed="yes" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
 
 	<rule>
 		<condition k="maxspeed" v="default"/>
-		<linemod mode="under" dashed="yes" width="+4" colour="#40ff40" priority="10000" />
+		<linemod mode="under" dashed="yes" width="+4" color="#40ff40" priority="10000" />
 		<icon src="vehicle/restrictions/speed.png" priority="10000" />
 	</rule>
 
 	<rule>
         <!-- default for unknown maxspeed -->
 		<condition k="maxspeed"/>
-		<line width="20" colour="#ffd0d0" priority="8000" />
+		<line width="20" color="#ffd0d0" priority="8000" />
 		<icon src="vehicle/restrictions/speed.png" priority="8000" />
 	</rule>
 
@@ -115,93 +115,93 @@
     
 	<rule>
 		<condition k="highway" v="motorway" />
-		<line width="3" colour="motorway#809bc0" priority="9000" />
+		<line width="3" color="motorway#809bc0" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
 	<rule>
 		<condition k="highway" v="motorway_link" />
-		<line width="3" colour="motorway#809bc0" priority="9000" />
+		<line width="3" color="motorway#809bc0" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="trunk" />
-		<line width="3" colour="trunk#7fc97f" priority="9000" />
+		<line width="3" color="trunk#7fc97f" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
 	<rule>
 		<condition k="highway" v="trunk_link" />
-		<line width="3" colour="trunk#7fc97f" priority="9000" />
+		<line width="3" color="trunk#7fc97f" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="primary" />
-		<line width="3" realwidth="8" colour="primary#fb805f" priority="9000" />
+		<line width="3" realwidth="8" color="primary#fb805f" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
 	<rule>
 		<condition k="highway" v="primary_link" />
-		<line width="3" realwidth="8" colour="primary#fb805f" priority="9000" />
+		<line width="3" realwidth="8" color="primary#fb805f" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="secondary" />
-		<line width="3" realwidth="6" colour="secondary#fdbf6f" priority="9000"/>
+		<line width="3" realwidth="6" color="secondary#fdbf6f" priority="9000"/>
 		<icon annotate="false" priority="-9000" />
 	</rule>
 	<rule>
 		<condition k="highway" v="secondary_link" />
-		<line width="3" realwidth="6" colour="secondary#fdbf6f" priority="9000"/>
+		<line width="3" realwidth="6" color="secondary#fdbf6f" priority="9000"/>
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="tertiary" />
-		<line width="2" realwidth="5" colour="tertiary#f7f496" priority="9000" />
+		<line width="2" realwidth="5" color="tertiary#f7f496" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="residential" />
-		<line width="2" realwidth="5" colour="street#c0c0c0" priority="9000" />
+		<line width="2" realwidth="5" color="street#c0c0c0" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="unclassified" />
-		<line width="2" realwidth="5" colour="street#c0c0c0" priority="9000" />
+		<line width="2" realwidth="5" color="street#c0c0c0" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="road" />
-		<line width="2" realwidth="5" dashed="true" colour="deprecated#ff0000" priority="9000" />
+		<line width="2" realwidth="5" dashed="true" color="deprecated#ff0000" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="service" />
-		<line width="1" realwidth="3" colour="service#809bc0" priority="9000" />
+		<line width="1" realwidth="3" color="service#809bc0" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="turning_circle" />
-		<line width="3" colour="#d0d0d0" priority="9000" />
+		<line width="3" color="#d0d0d0" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="track" />
-		<line width="1" realwidth="3" colour="track#006600" priority="9000"/>
+		<line width="1" realwidth="3" color="track#006600" priority="9000"/>
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="living_street" />
-		<line width="1" realwidth="3" colour="street#c0c0c0" priority="9000"/>
+		<line width="1" realwidth="3" color="street#c0c0c0" priority="9000"/>
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
@@ -209,146 +209,146 @@
     <!-- highway not suitable for maxspeed? -->
 	<rule>
 		<condition k="highway" v="pedestrian" />
-		<line width="0" colour="#303030" priority="9000" />
+		<line width="0" color="#303030" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="footway" />
-		<line width="0" colour="#303030" priority="9000" />
+		<line width="0" color="#303030" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="bridleway" />
-		<line width="0" colour="#303030" priority="9000" />
+		<line width="0" color="#303030" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="path" />
-		<line width="0" colour="#303030" priority="9000" />
+		<line width="0" color="#303030" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="steps" />
-		<line width="0" colour="#303030" priority="9000" />
+		<line width="0" color="#303030" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="cycleway" />
-		<line width="0" colour="#303030" priority="9000" />
+		<line width="0" color="#303030" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway" v="construction" />
-		<line width="0" colour="#303030" priority="9000" />
+		<line width="0" color="#303030" priority="9000" />
 		<icon annotate="false" priority="-9000" />
 	</rule>
     
 	<rule>
 		<condition k="highway"/>
-		<line width="20" colour="#d0d0d0" priority="-100" />
+		<line width="20" color="#d0d0d0" priority="-100" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
     
     
 	<rule>
 		<condition k="amenity"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="shop"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="place"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="tourism"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="railway"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="natural"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="historic"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="man_made"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="leisure"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="sport"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="aeroway"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="power"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="landuse"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="cemetery" v="grave"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="building"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="barrier"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="waterway"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="boundary"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 	<rule>
 		<condition k="addr:housenumber"/>
-		<line width="0" colour="#252525" priority="-10000" />
+		<line width="0" color="#252525" priority="-10000" />
 		<icon annotate="false" priority="-10000" />
 	</rule>
 
Index: src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
===================================================================
--- src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	(Revision 2929)
+++ src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	(Arbeitskopie)
@@ -99,7 +99,7 @@
                     line.setWidth(Integer.parseInt(val));
                 }
             }
-            else if (atts.getQName(count).equals("colour")) {
+            else if (atts.getQName(count).equals("color")) {
                 line.color=convertColor(atts.getValue(count));
             } else if (atts.getQName(count).equals("realwidth")) {
                 line.realWidth=Integer.parseInt(atts.getValue(count));
@@ -120,7 +120,7 @@
                     }
                 }
                 line.setDashed(dashed);
-            } else if (atts.getQName(count).equals("dashedcolour")) {
+            } else if (atts.getQName(count).equals("dashedcolor")) {
                 line.dashedColor=convertColor(atts.getValue(count));
             } else if(atts.getQName(count).equals("priority")) {
                 line.priority = Integer.parseInt(atts.getValue(count));
@@ -218,7 +218,7 @@
                 hadArea = inArea = true;
                 for (int count=0; count<atts.getLength(); count++)
                 {
-                    if (atts.getQName(count).equals("colour")) {
+                    if (atts.getQName(count).equals("color")) {
                         rule.area.color=convertColor(atts.getValue(count));
                     } else if (atts.getQName(count).equals("closed")) {
                         rule.area.closed=Boolean.parseBoolean(atts.getValue(count));
Index: src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- src/org/openstreetmap/josm/data/Preferences.java	(Revision 2929)
+++ src/org/openstreetmap/josm/data/Preferences.java	(Arbeitskopie)
@@ -574,11 +574,11 @@
     }
 
     /**
-     * Convenience method for accessing colour preferences.
+     * Convenience method for accessing color preferences.
      *
-     * @param colName name of the colour
+     * @param colName name of the color
      * @param def default value
-     * @return a Color object for the configured colour, or the default value if none configured.
+     * @return a Color object for the configured color, or the default value if none configured.
      */
     synchronized public Color getColor(String colName, Color def) {
         return getColor(colName, null, def);
@@ -589,12 +589,12 @@
     }
 
     /**
-     * Convenience method for accessing colour preferences.
+     * Convenience method for accessing color preferences.
      *
-     * @param colName name of the colour
-     * @param specName name of the special colour settings
+     * @param colName name of the color
+     * @param specName name of the special color settings
      * @param def default value
-     * @return a Color object for the configured colour, or the default value if none configured.
+     * @return a Color object for the configured color, or the default value if none configured.
      */
     synchronized public Color getColor(String colName, String specName, Color def) {
         putDefault("color."+colName, ColorHelper.color2html(def));
Index: src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java	(Revision 2929)
+++ src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java	(Arbeitskopie)
@@ -138,7 +138,7 @@
 
         /* draw tagged ways first, then untagged ways. takes
            time to iterate through list twice, OTOH does not
-           require changing the colour while painting... */
+           require changing the color while painting... */
         //profilerN = 0;
         for (final OsmPrimitive osm: data.getRelations()) {
             if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isFiltered()) {
Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(Revision 2929)
+++ data/defaultpresets.xml	(Arbeitskopie)
@@ -2486,7 +2486,7 @@
             <key key="amenity" value="bench" />
             <combo key="backrest" text="Backrest" values="yes,no" default="" delete_if_empty="true" />
             <combo key="material" text="Material" values="stone,metal,wood,plastic" default="" delete_if_empty="true" />
-            <combo key="colour" text="Colour" values="black,brown,green,red,blue,gray,white" default="" delete_if_empty="true" />
+            <combo key="color" text="Color" values="black,brown,green,red,blue,gray,white" default="" delete_if_empty="true" />
             <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" default="" delete_if_empty="true" />
         </item>
         <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node">