Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 1536)
+++ /trunk/styles/standard/elemstyles.xml	(revision 1537)
@@ -576,4 +576,5 @@
 		<condition k="highway" v="pedestrian"/>
 		<line width="3" realwidth="5" colour="foot#00ff00"/>
+		<area colour="foot#00ff00"/>
 		<icon annotate="true" src="misc/deprecated.png"/>
 		<scale_min>1</scale_min>
@@ -724,4 +725,11 @@
 		<line width="2" realwidth="5" colour="construction#ffff00" dashed="true"/>
 		<icon src="misc/construction.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="highway" v="emergency_access_point"/>
+		<icon src="misc/no_icon.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1334,4 +1342,28 @@
 
 	<rule>
+		<condition k="power_source" v="coal"/>
+		<icon annotate="true" src="misc/landmark/power/fossil.png"/>
+		<area colour="power#eeeeee"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="power_source" v="gas"/>
+		<icon annotate="true" src="misc/landmark/power/fossil.png"/>
+		<area colour="power#eeeeee"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="power_source" v="photovoltaic"/>
+		<icon annotate="true" src="misc/landmark/power/fossil.png"/>
+		<area colour="power#eeeeee"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="power_source" v="nuclear"/>
 		<icon annotate="true" src="misc/landmark/power/nuclear.png"/>
@@ -1916,5 +1948,26 @@
 
 	<rule>
+		<condition k="religion" v="spiritualist"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="religion" v="taoist"/>
+		<icon annotate="true" src="religion/taoism.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="religion" v="unitarian"/>
+		<icon annotate="true" src="religion/taoism.png"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="religion" v="zoroastrian"/>
 		<icon annotate="true" src="religion/taoism.png"/>
 		<scale_min>1</scale_min>
@@ -2486,4 +2539,20 @@
 
 	<rule>
+		<condition k="shop" v="sports"/>
+		<icon annotate="true" src="sport/multi.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="stationery"/>
+		<icon annotate="true" src="misc/no_icon.png"/>
+		<area colour="shop#00005f"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
 		<condition k="shop" v="tailor"/>
 		<icon annotate="true" src="shop/tailor.png"/>
@@ -3077,4 +3146,5 @@
 		<condition k="natural" v="cliff"/>
 		<icon src="misc/no_icon.png"/>
+		<line width="2" colour="natural#002f00"/>
 		<area colour="natural#002f00"/>
 		<scale_min>1</scale_min>
@@ -3124,4 +3194,12 @@
 	<rule>
 		<condition k="natural" v="marsh"/>
+		<icon src="misc/deprecated.png"/>
+		<area colour="deprecated#ff0000"/>
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="natural" v="wetland"/>
 		<icon src="misc/no_icon.png"/>
 		<area colour="marsh#4f4ff3"/>