Index: /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml
===================================================================
--- /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 3541)
+++ /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 3542)
@@ -135,19 +135,71 @@
 
 	<!-- mini_roundabout tag -->
-	<!-- stop tag -->
-	<!-- traffic signals tag -->
+
+	<rule>
+		<condition k="highway" v="stop" />
+		<icon annotate="true" src="stop.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="highway" v="traffic_signals" />
+		<icon annotate="true" src="traffic_signals.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
 	<!-- crossing tag -->
-	<!-- gate tag -->
-	<!-- stile tag -->
-	<!-- cattle_grid tag -->
-	<!-- toll_booth tag -->
+
+	<rule>
+		<condition k="highway" v="gate" />
+		<icon annotate="true" src="gate.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="highway" v="stile" />
+		<icon annotate="true" src="stile.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="highway" v="cattle_grid" />
+		<icon annotate="true" src="cattle_grid.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="highway" v="toll_booth" />
+		<icon annotate="true" src="toll_booth.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
 	<!-- incline tag -->
 	<!-- incline_steep tag -->
 	<!-- viaduct tag -->
 	<!-- motorway_junction tag -->
-	<!-- services tag -->
+	
+	<rule>
+		<condition k="highway" v="services" />
+		<icon annotate="true" src="services.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
 	<!-- ford tag -->
-	<!-- bus_stop tag -->
-	<!-- junction/roundabout tag -->
+
+	<rule>
+		<condition k="highway" v="bus_stop" />
+		<icon annotate="true" src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<!-- junction/roundabout tag - probably no icon needed, it's obvious from the context -->
 
 <!-- cycleway tags -->
@@ -347,4 +399,11 @@
 
 	<rule>
+		<condition k="amenity" v="cafe" />
+		<icon annotate="true" src="cafe.png"  />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="amenity" v="parking" />
 		<icon annotate="true" src="carpark.png" />
@@ -555,4 +614,18 @@
 <!--shop tags -->
 
+	<rule>
+		<condition k="tourism" v="bakers" />
+		<icon annotate="true" src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="tourism" v="butchers" />
+		<icon annotate="true" src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 <!--tourism tags -->
 	<rule>
@@ -699,5 +772,12 @@
 
 	<rule>
-		<condition k="landuse" v="bassin"/>
+		<condition k="landuse" v="basin"/>
+		<area colour="#0000bf" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="landuse" v="reservoir"/>
 		<area colour="#0000bf" />
         <scale_min>1</scale_min>
@@ -713,4 +793,53 @@
 
 	<rule>
+		<condition k="landuse" v="allotments"/>
+		<area colour="#b1e0c2" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="landuse" v="residential"/>
+		<area colour="#f0f0f0"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="landuse" v="retail"/>
+		<area colour="#dbdbdb"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="landuse" v="commercial"/>
+		<area colour="#dbdbdb"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="landuse" v="industrial"/>
+		<area colour="#ecd8ff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="landuse" v="brownfield"/>
+		<area colour="#ecba32"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="landuse" v="greenfield"/>
+		<area colour="#b1ec5c"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="landuse" v="cemetery"/>
 		<line width="1" colour="#bde3cb"/>
@@ -720,13 +849,13 @@
 
 	<rule>
-		<condition k="landuse" v="residential"/>
-		<area colour="#f0f0f0"/>
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="landuse" v="industrial"/>
-		<area colour="#ecd8ff"/>
+		<condition k="landuse" v="village_green"/>
+		<area colour="#b1e0c2" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="landuse" v="recreation_ground"/>
+		<area colour="#b1e0c2" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -734,4 +863,25 @@
 
 <!--military tags -->
+	<rule>
+		<condition k="military" v="airfield" />
+		<area colour="#b62c2c"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="military" v="bunker" />
+		<area colour="#b62c2c"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="military" v="barracks" />
+		<area colour="#b62c2c"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 	<rule>
 		<condition k="military" v="danger_area" />
@@ -741,5 +891,19 @@
 	</rule>
 
+	<rule>
+		<condition k="military" v="range" />
+		<area colour="#b62c2c"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 <!--natural tags -->
+    <rule>
+        <condition k="natural" v="spring"/>
+        <icon annotate="true" src="icon_missing.png"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
     <rule>
         <condition k="natural" v="peak"/>
@@ -750,4 +914,25 @@
     
     <rule>
+        <condition k="natural" v="cliff"/>
+        <area colour="#002f00"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+
+    <rule>
+        <condition k="natural" v="scree"/>
+        <area colour="#002f00"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+
+	<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="fell"/>
         <area colour="#002f00"/>
@@ -756,11 +941,4 @@
     </rule>
 
-	<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"/>
@@ -778,4 +956,11 @@
     
     <rule>
+		<condition k="natural" v="marsh"/>
+		<area colour="#4f4ff3"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+    <rule>
 		<condition k="natural" v="water"/>
 		<area colour="#0000ff"/>
@@ -791,16 +976,128 @@
     </rule>
     
+    <rule>
+		<condition k="natural" v="mud"/>
+		<area colour="#cba762"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+    <rule>
+		<condition k="natural" v="beach"/>
+		<area colour="#f8dba2"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+    <rule>
+		<condition k="natural" v="bay"/>
+		<area colour="#002f00"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+    <rule>
+		<condition k="natural" v="land"/>
+		<area colour="#002f00"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 <!--route tags -->
 
+	<rule>
+		<condition k="route" v="bus"/>
+        <line width="1" colour="#809bc0"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="route" v="ferry"/>
+        <line width="1" colour="#809bc0"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="route" v="flight"/>
+        <line width="1" colour="#809bc0"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="route" v="ncn"/>
+        <line width="1" colour="#809bc0"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="route" v="subsea"/>
+        <line width="1" colour="#809bc0"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="route" v="ski"/>
+        <line width="1" colour="#809bc0"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="route" v="tour"/>
+        <line width="1" colour="#809bc0"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="route" v="pub_crawl"/>
+        <line width="1" colour="#809bc0"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 <!--boundary tags -->
 
+	<rule>
+		<condition k="boundary" v="national"/>
+        <line width="1" colour="#3a5d8c"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="boundary" v="administrative"/>
+        <line width="1" colour="#3a5d8c"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="boundary" v="civil"/>
+        <line width="1" colour="#3a5d8c"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="boundary" v="political"/>
+        <line width="1" colour="#3a5d8c"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="boundary" v="national_park"/>
+        <line width="1" colour="#3a5d8c"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
 <!--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" />