Index: /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml
===================================================================
--- /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 3601)
+++ /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 3602)
@@ -241,13 +241,48 @@
 	</rule>
 	
-<!-- junction/roundabout tag - probably no icon needed, it's obvious from the context -->
+<!-- junction tag -->
+
+	<rule>
+		<condition k="junction" v="roundabout" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
 
 <!-- cycleway tags -->
 
-	<!-- lane tag -->
-	<!-- track tag -->
-	<!-- opposite_lane tag -->
-	<!-- opposite_track tag -->
-	<!-- opposite tag -->
+	<rule>
+		<condition k="cycleway" v="lane"/>
+		<line width="1" realwidth="2" colour="#ff00ff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="cycleway" v="track"/>
+		<line width="1" realwidth="2" colour="#ff00ff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="cycleway" v="opposite_lane"/>
+		<line width="1" realwidth="2" colour="#ff00ff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="cycleway" v="opposite_track"/>
+		<line width="1" realwidth="2" colour="#ff00ff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
+		<condition k="cycleway" v="opposite"/>
+		<line width="1" realwidth="2" colour="#ff00ff"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
 
 <!-- tracktype tags -->
@@ -396,5 +431,5 @@
 	<rule>
 		<condition k="railway" v="rail"/>
-		<line width="2" colour="#808080"/>
+		<line width="2" colour="#808080" dashed="true"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -403,5 +438,5 @@
     <rule>
         <condition k="railway" v="tram"/>
-        <line width="1" colour="#606060"/>
+        <line width="1" colour="#606060" dashed="true"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -410,5 +445,5 @@
     <rule>
         <condition k="railway" v="light_rail"/>
-        <line width="2" colour="#808080"/>
+        <line width="2" colour="#808080" dashed="true"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -417,5 +452,40 @@
     <rule>
         <condition k="railway" v="subway"/>
-        <line width="1" colour="#202020"/>
+        <line width="1" colour="#202020" dashed="true"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="railway" v="preserved"/>
+        <line width="1" colour="#202020" dashed="true"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="railway" v="disused"/>
+        <line width="1" colour="#202020" dashed="true"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="railway" v="abandoned"/>
+        <line width="1" colour="#202020" dashed="true"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="railway" v="narrow_gauge"/>
+        <line width="1" colour="#202020" dashed="true"/>
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="railway" v="monorail"/>
+        <line width="1" colour="#202020" dashed="true"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -432,6 +502,13 @@
     
     <rule>
-        <condition k="aeroway" v="airport"/>
-		<icon annotate="true" src="airport.png" />
+        <condition k="aeroway" v="terminal"/>
+		<icon annotate="true" src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+    </rule>
+    
+    <rule>
+        <condition k="aeroway" v="helipad"/>
+		<icon annotate="true" src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -649,4 +726,5 @@
 	<rule>
 		<condition k="leisure" v="park"/>
+		<icon annotate="true" src="icon_missing.png" />
 		<area colour="#c7f1a3"/>
         <scale_min>1</scale_min>
@@ -656,4 +734,5 @@
 	<rule>
 		<condition k="leisure" v="playground"/>
+		<icon annotate="true" src="icon_missing.png" />
 		<area colour="#c7f1a3"/>
         <scale_min>1</scale_min>
@@ -1056,4 +1135,5 @@
         <condition k="landuse" v="quarry"/>
         <area colour="#cccccc" />
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1063,4 +1143,5 @@
         <condition k="landuse" v="landfill"/>
         <area colour="#663300" />
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1070,4 +1151,5 @@
 		<condition k="landuse" v="basin"/>
 		<area colour="#0000bf" />
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1077,4 +1159,5 @@
 		<condition k="landuse" v="reservoir"/>
 		<area colour="#0000bf" />
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1084,4 +1167,5 @@
 		<condition k="landuse" v="forest"/>
 		<area colour="#b1efc8" />
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1091,4 +1175,5 @@
 		<condition k="landuse" v="allotments"/>
 		<area colour="#b1e0c2" />
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1098,4 +1183,5 @@
 		<condition k="landuse" v="residential"/>
 		<area colour="#f0f0f0"/>
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1105,4 +1191,5 @@
 		<condition k="landuse" v="retail"/>
 		<area colour="#dbdbdb"/>
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1112,4 +1199,5 @@
 		<condition k="landuse" v="commercial"/>
 		<area colour="#dbdbdb"/>
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1119,4 +1207,5 @@
 		<condition k="landuse" v="industrial"/>
 		<area colour="#ecd8ff"/>
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1126,4 +1215,5 @@
 		<condition k="landuse" v="brownfield"/>
 		<area colour="#ecba32"/>
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1133,4 +1223,5 @@
 		<condition k="landuse" v="greenfield"/>
 		<area colour="#b1ec5c"/>
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1140,4 +1231,5 @@
 		<condition k="landuse" v="cemetery"/>
 		<line width="1" colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1147,4 +1239,5 @@
 		<condition k="landuse" v="village_green"/>
 		<area colour="#b1e0c2" />
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1154,4 +1247,5 @@
 		<condition k="landuse" v="recreation_ground"/>
 		<area colour="#b1e0c2" />
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1397,6 +1491,231 @@
 <!--sport tags -->
 	<rule>
+		<condition k="sport" v="10pin" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="athletics" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="baseball" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="basketball" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="bowls" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="climbing" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="cricket" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="cricket_nets" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="croquet" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="cycling" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="dog_racing" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="equestrain" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="football" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="golf" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="gymnastics" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="hockey" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="horse_racing" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="motor" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="multi" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="pelota" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="racquet" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="rubgy" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="skating" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="skateboard" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="sport" v="soccer" />
 		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="swimming" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="skiing" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="table_tennis" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="sport" v="tennis" />
+		<area colour="#bde3cb"/>
+		<icon src="icon_missing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>