Index: /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml
===================================================================
--- /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 3455)
+++ /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 3456)
@@ -161,4 +161,11 @@
 
     <rule>
+        <condition k="waterway" v="stream"/>
+        <line width="1" colour="#6600cc" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
         <condition k="waterway" v="drain"/>
         <line width="1" colour="#0000ff"/>
@@ -185,4 +192,6 @@
 		<condition k="railway" v="level_crossing" />
 		<icon annotate="true" src="crossing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -217,4 +226,25 @@
 <!--aeroway tags -->
 
+    <rule>
+        <condition k="aeroway" v="runway"/>
+        <line width="3" colour="#330000" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="aeroway" v="taxiway"/>
+        <line width="2" colour="#660000" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="aeroway" v="apron"/>
+        <area colour="#D8D8D8" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
 <!--aerialway tags -->
 
@@ -225,4 +255,6 @@
 		<condition k="man_made" v="mast" />
 		<icon annotate="true" src="mast.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -266,5 +298,5 @@
 	<rule>
 		<condition k="amenity" v="fast_food" />
-		<icon annotate="true" src="fast_food.png" />
+		<icon annotate="true" src="restaurant.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -315,6 +347,29 @@
 		<condition k="landuse" v="farm" />
 		<icon annotate="true" src="farm.png"  />
-	</rule>
-
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+    <rule>
+        <condition k="landuse" v="quarry"/>
+        <area colour="#cccccc" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="landuse" v="landfill"/>
+        <area colour="#663300" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+
+	<rule>
+		<condition k="landuse" v="bassin"/>
+		<area colour="#0000bf" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
 	<rule>
 		<condition k="landuse" v="forest"/>
@@ -327,4 +382,6 @@
 		<condition k="landuse" v="cemetery"/>
 		<line width="1" colour="#bde3cb"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -332,4 +389,6 @@
 		<condition k="landuse" v="residential"/>
 		<area colour="#f0f0f0"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -337,4 +396,6 @@
 		<condition k="landuse" v="industrial"/>
 		<area colour="#ecd8ff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -343,4 +404,6 @@
 		<condition k="military" v="danger_area" />
 		<area colour="#b62c2c"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
 	</rule>
 
@@ -348,5 +411,5 @@
     <rule>
         <condition k="natural" v="peak"/>
-        <icon annotate="true" src="peak_small.png"
+        <icon annotate="true" src="peak_small.png"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -361,4 +424,11 @@
 
 	<rule>
+        <condition k="natural" v="scrub" />
+        <area colour="#007000" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
 		<condition k="natural" v="heath"/>
         <area colour="#ffffc0"/>
@@ -368,4 +438,11 @@
 
 	<rule>
+        <condition k="natural" v="wood"/>
+        <area colour="#008000" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
 		<condition k="natural" v="water"/>
 		<area colour="#0000ff"/>
@@ -387,4 +464,11 @@
 <!--sport tags -->
 	<rule>
+        <condition k="landuse" v="football"/>
+        <area colour="#99ff99" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+
+	<rule>
 		<condition k="sport" v="soccer" />
 		<area colour="#bde3cb"/>