Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 3912)
+++ /trunk/data/defaultpresets.xml	(revision 3913)
@@ -2543,8 +2543,18 @@
         </item>
         <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
-                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_hydrant"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant" />
             <label text="Edit Fire Hydrant" />
-            <key key="amenity" value="fire_hydrant" />
+            <key key="emergency" value="fire_hydrant" />
+            <combo key="fire_hydrant:type" text="Type" values="underground,pillar,wall,pond" values_context="pipeline" default="pillar" delete_if_empty="true" />
+            <combo key="fire_hydrant:diameter" text="Diameter" values="50,80,100,150,200,250,300,400" default="" delete_if_empty="true" />
+            <space />
+            <text key="name" text="Name" default="" delete_if_empty="true" />
+            <text key="ref" text="Reference" default="" delete_if_empty="true" />
+            <text key="operator" text="Operator" default="" delete_if_empty="true" />
+            <space />
+            <combo key="fire_hydrant:position" text="Position" values="lane,parking_lot,sidewalk,green" default="" delete_if_empty="true" />
+            <combo key="fire_hydrant:pressure" text="Pressure" values="xx l/min,suction" default="" delete_if_empty="true" />
+            <text key="fire_hydrant:count" text="Count" values="" default="" delete_if_empty="true" />
         </item>
     </group> <!-- Facilities -->
Index: /trunk/styles/standard/elemstyles.xml
===================================================================
--- /trunk/styles/standard/elemstyles.xml	(revision 3912)
+++ /trunk/styles/standard/elemstyles.xml	(revision 3913)
@@ -2036,6 +2036,5 @@
 
 	<rule>
-		<condition k="amenity" v="fire_hydrant"/>
-		<area colour="amenity_light#f7efb7"/>
+		<condition k="emergency" v="fire_hydrant"/>
 		<icon annotate="true" src="service/fire_hydrant.png"/>
 	</rule>