Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 1333)
+++ trunk/styles/standard/elemstyles.xml	(revision 1334)
@@ -560,5 +560,5 @@
 	<rule>
 		<condition k="highway" v="steps"/>
-		<line width="1" realwidth="1" colour="foot#00ff00"/>
+		<line width="1" realwidth="1" dashed="1" colour="foot#00ff00"/>
 		<icon annotate="true" src="transport/steps.png"/>
 		<scale_min>1</scale_min>
@@ -682,5 +682,5 @@
 	<rule>
 		<condition k="highway" v="turning_circle"/>
-		<area width="1" colour="turningcircle#c0c0c0"/>
+		<area colour="turningcircle#c0c0c0"/>
 		<icon annotate="true" src="vehicle/turning_circle.png"/>
 		<scale_min>1</scale_min>
@@ -700,5 +700,5 @@
 	<rule>
 		<condition k="junction" v="roundabout"/>
-		<area width="1" colour="roundabout#eeeeee"/>
+		<area colour="roundabout#eeeeee"/>
 		<!-- 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"/>
@@ -753,5 +753,5 @@
 	<rule>
 		<condition k="tracktype" v="grade1"/>
-		<line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
+		<line width="1" realwidth="3" colour="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -761,5 +761,5 @@
 	<rule>
 		<condition k="tracktype" v="grade2"/>
-		<line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
+		<line width="1" realwidth="3" dashed="3" colour="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -769,5 +769,5 @@
 	<rule>
 		<condition k="tracktype" v="grade3"/>
-		<line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
+		<line width="1" realwidth="3" dashed="6" colour="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -777,5 +777,5 @@
 	<rule>
 		<condition k="tracktype" v="grade4"/>
-		<line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
+		<line width="1" realwidth="3" dashed="9" colour="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -785,5 +785,5 @@
 	<rule>
 		<condition k="tracktype" v="grade5"/>
-		<line width="1" realwidth="3" dashed="true" colour="highway_track#006600"/>
+		<line width="1" realwidth="3" dashed="12" colour="highway_track#006600"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -836,5 +836,5 @@
 	<rule>
 		<condition k="waterway" v="dock"/>
-		<area width="1" colour="dock#0000cf"/>
+		<area colour="dock#0000cf"/>
 		<icon annotate="true" src="nautical/boatyard.png"/>
 		<scale_min>1</scale_min>
@@ -1139,5 +1139,5 @@
 	<rule>
 		<condition k="aerialway" v="cable_car"/>
-		<line width="1" colour="aerialway#663300" dashed="true"/>
+		<line width="1" colour="aerialway#663300" dashed="9"/>
 		<icon annotate="true" src="transport/aerialway/cable_car.png"/>
 		<scale_min>1</scale_min>
@@ -1147,5 +1147,5 @@
 	<rule>
 		<condition k="aerialway" v="chair_lift"/>
-		<line width="1" colour="aerialway#663300" dashed="true"/>
+		<line width="1" colour="aerialway#663300" dashed="6"/>
 		<icon annotate="true" src="transport/aerialway/chair_lift.png"/>
 		<scale_min>1</scale_min>
@@ -1155,5 +1155,5 @@
 	<rule>
 		<condition k="aerialway" v="drag_lift"/>
-		<line width="1" colour="aerialway#663300" dashed="true"/>
+		<line width="1" colour="aerialway#663300" dashed="3"/>
 		<icon annotate="true" src="transport/aerialway/drag_lift.png"/>
 		<scale_min>1</scale_min>
@@ -1163,5 +1163,5 @@
 	<rule>
 		<condition k="aerialway" v="station"/>
-		<line width="1" colour="aerialway#663300" dashed="true"/>
+		<area colour="aerialway#663300"/>
 		<icon annotate="true" src="transport/aerialway/station.png"/>
 		<scale_min>1</scale_min>
@@ -1216,5 +1216,5 @@
 		<condition k="power" v="tower"/>
 		<icon annotate="true" src="misc/landmark/power/tower_small.png"/>
-		<area width="1" colour="power#eeeeee"/>
+		<area colour="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1232,5 +1232,5 @@
 		<condition k="power" v="sub_station"/>
 		<icon annotate="true" src="misc/landmark/power.png"/>
-		<area width="1" colour="power#eeeeee"/>
+		<area colour="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1240,5 +1240,5 @@
 		<condition k="power_source" v="wind"/>
 		<icon annotate="true" src="misc/landmark/power/wind.png"/>
-		<area width="1" colour="power#eeeeee"/>
+		<area colour="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1248,5 +1248,5 @@
 		<condition k="power_source" v="hydro"/>
 		<icon annotate="true" src="misc/landmark/power/hydro.png"/>
-		<area width="1" colour="power#eeeeee"/>
+		<area colour="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1256,5 +1256,5 @@
 		<condition k="power_source" v="fossil"/>
 		<icon annotate="true" src="misc/landmark/power/fossil.png"/>
-		<area width="1" colour="power#eeeeee"/>
+		<area colour="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1264,5 +1264,5 @@
 		<condition k="power_source" v="nuclear"/>
 		<icon annotate="true" src="misc/landmark/power/nuclear.png"/>
-		<area width="1" colour="power#eeeeee"/>
+		<area colour="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1272,5 +1272,5 @@
 		<condition k="power" v="generator"/>
 		<icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-		<area width="1" colour="power#eeeeee"/>
+		<area colour="power#eeeeee"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1834,7 +1834,7 @@
 
 	<rule>
-		<condition k="amenity" v="place_of_worship" priority="-10000"/>
-		<icon annotate="true" src="religion.png"/>
-		<area colour="amenity_light#f7efb7"/>
+		<condition k="amenity" v="place_of_worship"/>
+		<icon annotate="true" src="religion.png" priority="-10000"/>
+		<area colour="amenity_light#f7efb7" priority="-10000"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2772,5 +2772,6 @@
 	<rule>
 		<condition k="landuse" v="construction"/>
-		<area colour="construction#ffff00" dashed="true"/>
+		<area colour="construction#ffff00"/>
+		<line width="1" colour="construction#ffff00" dashed="true"/>
 		<icon src="misc/construction.png"/>
 		<scale_min>1</scale_min>