Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 4209)
+++ /trunk/data/defaultpresets.xml	(revision 4210)
@@ -3103,5 +3103,6 @@
             <label text="Edit Power Generator" />
             <key key="power" value="generator" />
-            <combo key="power_source" text="Type" values="wind,hydro,fossil,nuclear,coal,photovoltaic,gas,oil" default="" />
+            <combo key="generator:source" text="Source" values="wind,hydro,solar,gas,coal,nuclear,fossil,oil,biofuel,waste,biomass,geothermal,biogas" default="" />
+            <combo key="generator:method" text="Method" values="photovoltaic,combustion,fission,thermal,gasification,wind_turbine,anaerobic_digestion" default="" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
         </item>
Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 4209)
+++ /trunk/styles/standard/elemstyles.xml	(revision 4210)
@@ -1241,4 +1241,5 @@
 	</rule>
 
+    <!-- power_source is depricated by the wiki, but still in use -->
 	<rule>
 		<condition k="power_source" v="wind"/>
@@ -1279,4 +1280,35 @@
 	<rule>
 		<condition k="power_source" v="nuclear"/>
+		<icon annotate="true" src="misc/landmark/power/nuclear.png"/>
+		<area colour="power#eeeeee"/>
+	</rule>
+
+    <!-- generator:source replaces power_source -->
+	<rule>
+		<condition k="generator:source" v="wind"/>
+		<icon annotate="true" src="misc/landmark/power/wind.png"/>
+		<area colour="power#eeeeee"/>
+	</rule>
+
+	<rule>
+		<condition k="generator:source" v="hydro"/>
+		<icon annotate="true" src="misc/landmark/power/hydro.png"/>
+		<area colour="power#eeeeee"/>
+	</rule>
+
+	<rule>
+		<condition k="generator:source" v="coal"/>
+		<icon annotate="true" src="misc/landmark/power/fossil.png"/>
+		<area colour="power#eeeeee"/>
+	</rule>
+
+	<rule>
+		<condition k="generator:source" v="gas"/>
+		<icon annotate="true" src="misc/landmark/power/fossil.png"/>
+		<area colour="power#eeeeee"/>
+	</rule>
+
+	<rule>
+		<condition k="generator:source" v="nuclear"/>
 		<icon annotate="true" src="misc/landmark/power/nuclear.png"/>
 		<area colour="power#eeeeee"/>