Index: applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml
===================================================================
--- applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 3454)
+++ applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 3455)
@@ -17,10 +17,14 @@
 	<rule>
 		<condition k="highway" v="motorway"/>
-		<line width="3" realwidth="8" colour="#809bc0"/>
+        <line width="3" realwidth="8" colour="#809bc0"  width_bg="5" colour_bg="#FFFF00"/>
+        <scale_min>1</scale_min>
+        <scale_max>200000000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="highway" v="motorway_link"/>
-		<line width="3" colour="#809bc0"/>
+        <line width="3" colour="#809bc0"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -28,9 +32,13 @@
 		<condition k="highway" v="trunk"/>
 		<line width="3" colour="#7fc97f"/>
+        <scale_min>1</scale_min>
+        <scale_max>20000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="highway" v="trunk_link"/>
-		<line width="3" colour="#7fc97f"/>
+        <line width="3" colour="#7fc97f"/>
+        <scale_min>1</scale_min>
+        <scale_max>20000</scale_max>
 	</rule>
 
@@ -38,9 +46,13 @@
 		<condition k="highway" v="primary"/>
 		<line width="3" realwidth="8" colour="#fb805f"/>
+        <scale_min>1</scale_min>
+        <scale_max>700000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="highway" v="primary_link"/>
-		<line width="3" colour="#fb805f"/>
+        <line width="3" colour="#fb805f"/>
+        <scale_min>1</scale_min>
+        <scale_max>40000</scale_max>
 	</rule>
 
@@ -48,4 +60,13 @@
 		<condition k="highway" v="secondary"/>
 		<line width="3" realwidth="6" colour="#fdbf6f"/>
+        <scale_min>1</scale_min>
+        <scale_max>300000</scale_max>
+    </rule>
+
+    <rule>
+        <condition k="highway" v="tertiary"/>
+        <line width="1" colour="#333333"/>
+        <scale_min>1</scale_min>
+        <scale_max>30000</scale_max>
 	</rule>
 
@@ -53,4 +74,13 @@
 		<condition k="highway" v="unclassified"/>
 		<line width="2" colour="#c0c0c0"/>
+        <scale_min>1</scale_min>
+        <scale_max>40000</scale_max>
+    </rule>
+
+    <rule>
+        <condition k="highway" v="track"/>
+        <line width="1" colour="#006600"/>
+        <scale_min>1</scale_min>
+        <scale_max>20000</scale_max>
 	</rule>
 
@@ -58,4 +88,13 @@
 		<condition k="highway" v="residential"/>
 		<line width="2" realwidth="5" colour="#c0c0c0"/> 
+        <scale_min>1</scale_min>
+        <scale_max>40000</scale_max>
+    </rule>
+
+    <rule>
+        <condition k="highway" v="service"/>
+        <line width="1" colour="#809bc0"/>
+        <scale_min>1</scale_min>
+        <scale_max>20000</scale_max>
 	</rule>
 
@@ -63,4 +102,6 @@
 		<condition k="highway" v="bridleway"/>
 		<line width="1" colour="#c08000" />
+        <scale_min>1</scale_min>
+        <scale_max>30000</scale_max>
 	</rule>
 
@@ -68,4 +109,6 @@
 		<condition k="highway" v="cycleway"/>
 		<line width="1" realwidth="2" colour="#ff00ff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -73,4 +116,6 @@
 		<condition k="highway" v="footway"/>
 		<line width="1" realwidth="1" colour="#00ff00" />
+        <scale_min>1</scale_min>
+        <scale_max>10000</scale_max>
 	</rule>
 
@@ -78,26 +123,53 @@
 		<condition k="highway" v="pedestrian"/>
 		<line width="1" colour="#aaaaaa"/>
-	</rule>
+        <scale_min>1</scale_min>
+        <scale_max>10000</scale_max>
+    </rule>
+
+    <rule>
+        <condition k="highway" v="steps"/>
+        <line width="1" colour="#00ff00"/>
+        <scale_min>1</scale_min>
+        <scale_max>10000</scale_max>
+	</rule>
+
+<!-- cycleway tags -->
+
+<!-- tracktype tags -->
 
 <!--waterway tags -->
 	<rule>
 		<condition k="waterway" v="river"/>
-		<line realwidth="10" colour="#0000ff" />
+        <line width="2" realwidth="10" colour="#0000ff" width_bg="3" colour_bg="#00001f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="waterway" v="riverbank"/>
+        <line width="1" colour="#00005f" width_bg="1" colour_bg="#00001f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
 	<rule>
 		<condition k="waterway" v="canal"/>
-		<line width="2" colour="#0000ff" />
-	</rule>
-
-	<rule>
-		<condition k="waterway" v="riverbank"/>
-		<line width="1" colour="#0000ff"/>
-	</rule>
-
+        <line width="2" colour="#0000ff" width_bg="2" colour_bg="#00001f"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+    <rule>
+        <condition k="waterway" v="drain"/>
+        <line width="1" colour="#0000ff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
 
 	<rule>
 		<condition k="natural" v="coastline"/>
 		<line width="1" colour="#0000ff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -106,4 +178,11 @@
 		<condition k="railway" v="station" />
 		<icon annotate="true" src="station.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="railway" v="level_crossing" />
+		<icon annotate="true" src="crossing.png" />
 	</rule>
 
@@ -111,10 +190,34 @@
 		<condition k="railway" v="rail"/>
 		<line width="2" colour="#808080"/>
-	</rule>
-
-	<rule>
-		<condition k="railway" v="level_crossing" />
-		<icon annotate="true" src="crossing.png" />
-	</rule>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+    <rule>
+        <condition k="railway" v="tram"/>
+        <line width="1" colour="#606060"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+
+    <rule>
+        <condition k="railway" v="light_rail"/>
+        <line width="2" colour="#808080"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="railway" v="subway"/>
+        <line width="1" colour="#202020"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+<!--aeroway tags -->
+
+<!--aerialway tags -->
+
+<!--power tags -->
 
 <!--man_made tags -->
@@ -128,4 +231,6 @@
 		<condition k="leisure" v="park"/>
 		<area colour="#c7f1a3"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -133,4 +238,6 @@
 		<condition k="leisure" v="playground"/>
 		<area colour="#c7f1a3"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -139,4 +246,6 @@
 		<condition k="amenity" v="restaurant" />
 		<icon annotate="true" src="restaurant.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -144,4 +253,6 @@
 		<condition k="amenity" v="pub" />
 		<icon annotate="true" src="pub.png"  />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -149,4 +260,6 @@
 		<condition k="amenity" v="biergarten" />
 		<icon annotate="true" src="pub.png"  />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -154,4 +267,6 @@
 		<condition k="amenity" v="fast_food" />
 		<icon annotate="true" src="fast_food.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -159,4 +274,6 @@
 		<condition k="amenity" v="parking" />
 		<icon annotate="true" src="carpark.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -164,4 +281,6 @@
 		<condition k="amenity" v="place_of_worship" />
 		<icon annotate="true" src="church.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -172,4 +291,6 @@
 		<condition k="tourism" v="camp_site" />
 		<icon annotate="true" src="campsite.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -177,5 +298,14 @@
 		<condition k="tourism" v="viewpoint" />
 		<icon annotate="true" src="viewpoint.png"  />
-	</rule>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+    <rule>
+        <condition k="tourism" v="attraction"/>
+        <icon annotate="true" src="interest.png"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
 
 <!--historic tags -->
@@ -190,4 +320,6 @@
 		<condition k="landuse" v="forest"/>
 		<area colour="#b1efc8" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -214,7 +346,23 @@
 
 <!--natural tags -->
+    <rule>
+        <condition k="natural" v="peak"/>
+        <icon annotate="true" src="peak_small.png"
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="natural" v="fell"/>
+        <area colour="#002f00"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+
 	<rule>
 		<condition k="natural" v="heath"/>
-		<line width="1" colour="#ffffc0"/>
+        <area colour="#ffffc0"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -222,10 +370,18 @@
 		<condition k="natural" v="water"/>
 		<area colour="#0000ff"/>
-	</rule>
-
-	<rule>
-		<condition k="natural" v="peak" />
-		<icon annotate="true" src="peak_small.png"  />
-	</rule>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+    <rule>
+        <condition k="natural" v="coastline"/>
+        <line width="1" colour="#0000ff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+<!--route tags -->
+
+<!--boundary tags -->
 
 <!--sport tags -->
@@ -233,5 +389,19 @@
 		<condition k="sport" v="soccer" />
 		<area colour="#bde3cb"/>
-	</rule>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+<!--abutters tags -->
+
+<!--accessories tags -->
+
+<!--properties tags -->
+
+<!--restrictions tags -->
+
+<!--name tags -->
+
+<!--preferences tags -->
 
 <!--place tags -->
@@ -239,4 +409,6 @@
 		<condition k="place" v="city" />
 		<icon annotate="true" src="place.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -244,4 +416,6 @@
 		<condition k="place" v="town" />
 		<icon annotate="true" src="place.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -249,4 +423,6 @@
 		<condition k="place" v="village" />
 		<icon annotate="true" src="place.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -254,4 +430,6 @@
 		<condition k="place" v="hamlet" />
 		<icon annotate="true" src="place.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -259,5 +437,9 @@
 		<condition k="place" v="suburb" />
 		<icon annotate="true" src="place.png" />
-	</rule>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+<!--annotation tags -->
 
 </rules>