Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 1068)
+++ /trunk/presets/presets.xml	(revision 1069)
@@ -787,4 +787,113 @@
 	<separator/>
 
+	<group name="Waterway" icon="presets/waterway.png">
+		<item name="River" icon="presets/river.png">
+			<label text="Edit a River" />
+			<label text=" " />
+			<key key="waterway" value="river" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Canal" icon="presets/waterway.png">
+			<label text="Edit a Canal" />
+			<label text=" " />
+			<key key="waterway" value="canal" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Drain" icon="presets/waterway.png">
+			<label text="Edit a Drain" />
+			<label text=" " />
+			<key key="waterway" value="drain" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Stream" icon="presets/waterway.png">
+			<label text="Edit a Stream" />
+			<label text=" " />
+			<key key="waterway" value="stream" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+		</item>
+
+		<separator/>
+
+		<item name="Ferry Route" icon="presets/ferry.png">
+			<label text="Edit a Ferry" />
+			<label text=" " />
+			<key key="route" value="ferry" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<separator/>
+
+		<item name="Boatyard" icon="presets/boatyard.png">
+			<label text="Edit a Boatyard" />
+			<label text=" " />
+			<key key="waterway" value="boatyard" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Dock" icon="presets/waterway.png">
+			<label text="Edit a Dock" />
+			<label text=" " />
+			<key key="waterway" value="dock" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<separator/>
+
+		<item name="Dam" icon="presets/empty.png">
+			<label text="Edit a Dam" />
+			<label text=" " />
+			<key key="waterway" value="dam" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+	</group> <!-- Waterway -->
+
+	<group name="Waterway Point" icon="presets/waterwaypoint.png">
+		<item name="Lock Gate" icon="presets/lock_gate.png">
+			<key key="waterway" value="lock_gate" />
+		</item>
+
+		<item name="Weir" icon="presets/weir.png">
+			<label text="Edit a Weir" />
+			<label text=" " />
+			<key key="waterway" value="weir" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Waterfall" icon="presets/waterfall.png">
+			<label text="Edit a Waterfall" />
+			<label text=" " />
+			<key key="waterway" value="waterfall" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Turning Point" icon="presets/turning.png">
+			<key key="waterway" value="turning_point" />
+		</item>
+
+		<item name="Marina" icon="presets/marina.png">
+			<label text="Edit Marina" />
+			<key key="leisure" value="marina" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Slipway" icon="presets/slipway.png">
+			<label text="Edit Slipway" />
+			<key key="leisure" value="slipway" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+	</group> <!-- Waterway -->
+
+	<separator/>
+
 	<group name="Railway" icon="presets/railway.png">
 		<item name="Rail" icon="presets/railway.png">
@@ -794,5 +903,5 @@
 			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 		</item>
-
+		
 		<item name="Narrow Gauge Rail" icon="presets/railway.png">
 			<label text="Edit a Narrow Gauge Rail" />
@@ -801,5 +910,5 @@
 			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 		</item>
-
+		
 		<item name="Monorail" icon="presets/railway.png">
 			<label text="Edit a Monorail" />
@@ -808,5 +917,5 @@
 			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 		</item>
-
+		
 		<item name="Preserved" icon="presets/rail_preserved.png">
 			<label text="Edit a Preserved Railway" />
@@ -815,5 +924,5 @@
 			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 		</item>
-
+		
 		<item name="Light Rail" icon="presets/rail_light.png">
 			<label text="Edit a Light Rail" />
@@ -822,5 +931,5 @@
 			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 		</item>
-
+		
 		<item name="Subway" icon="presets/rail_light.png">
 			<label text="Edit a Subway" />
@@ -829,5 +938,5 @@
 			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 		</item>
-
+		
 		<item name="Tram" icon="presets/tram.png">
 			<label text="Edit a Tram" />
@@ -836,5 +945,5 @@
 			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 		</item>
-
+		
 		<item name="Bus Guideway" icon="presets/busway.png">
 			<label text="Edit a Bus Guideway" />
@@ -855,7 +964,7 @@
 			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 		</item>
-
+		
 		<separator/>
-
+		
 		<item name="Disused Rail" icon="presets/railway.png">
 			<label text="Edit a Disused Railway" />
@@ -864,19 +973,19 @@
 			<combo key="service" text="Optional Types" values="yard,siding,spur" default="" delete_if_empty="true" />
 		</item>
-
+		
 		<item name="Abandoned Rail" icon="presets/railway.png">
 			<key key="railway" value="abandoned"/>
 		</item>
-
+		
 		<separator/>
-
+		
 		<item name="Level Crossing" icon="presets/level_crossing.png">
 			<key key="railway" value="level_crossing" />
 		</item>
-
+		
 		<item name="Crossing" icon="presets/crossing.png">
 			<key key="railway" value="crossing" />
 		</item>
-
+		
 		<item name="Turntable" icon="presets/turntable.png">
 			<key key="railway" value="turntable" />
@@ -884,114 +993,4 @@
 	</group> <!-- Railway -->
 
-	<separator/>
-
-	<group name="Waterway" icon="presets/waterway.png">
-		<item name="River" icon="presets/river.png">
-			<label text="Edit a River" />
-			<label text=" " />
-			<key key="waterway" value="river" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Canal" icon="presets/waterway.png">
-			<label text="Edit a Canal" />
-			<label text=" " />
-			<key key="waterway" value="canal" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Drain" icon="presets/waterway.png">
-			<label text="Edit a Drain" />
-			<label text=" " />
-			<key key="waterway" value="drain" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Stream" icon="presets/waterway.png">
-			<label text="Edit a Stream" />
-			<label text=" " />
-			<key key="waterway" value="stream" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-		</item>
-
-		<separator/>
-
-		<item name="Ferry Route" icon="presets/ferry.png">
-			<label text="Edit a Ferry" />
-			<label text=" " />
-			<key key="route" value="ferry" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<separator/>
-
-		<item name="Boatyard" icon="presets/boatyard.png">
-			<label text="Edit a Boatyard" />
-			<label text=" " />
-			<key key="waterway" value="boatyard" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-		
-		<item name="Dock" icon="presets/waterway.png">
-			<label text="Edit a Dock" />
-			<label text=" " />
-			<key key="waterway" value="dock" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<separator/>
-
-		<item name="Dam" icon="presets/empty.png">
-			<label text="Edit a Dam" />
-			<label text=" " />
-			<key key="waterway" value="dam" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-	</group> <!-- Waterway -->
-
-	<group name="Waterway Point" icon="presets/waterwaypoint.png">
-		<item name="Lock Gate" icon="presets/lock_gate.png">
-			<key key="waterway" value="lock_gate" />
-		</item>
-
-		<item name="Weir" icon="presets/weir.png">
-			<label text="Edit a Weir" />
-			<label text=" " />
-			<key key="waterway" value="weir" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Waterfall" icon="presets/waterfall.png">
-			<label text="Edit a Waterfall" />
-			<label text=" " />
-			<key key="waterway" value="waterfall" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Turning Point" icon="presets/turning.png">
-			<key key="waterway" value="turning_point" />
-		</item>
-
-		<item name="Marina" icon="presets/marina.png">
-			<label text="Edit Marina" />
-			<key key="leisure" value="marina" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Slipway" icon="presets/slipway.png">
-			<label text="Edit Slipway" />
-			<key key="leisure" value="slipway" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-	</group> <!-- Waterway -->
-
-	<separator/>
 
 	<group name="Aerialway" icon="presets/aerialway.png">
@@ -1315,7 +1314,4 @@
 		</item>
 
-		<item name="Bench" icon="presets/bench.png">
-			<key key="amenity" value="bench" />
-		</item>
 	</group> <!-- Tourism -->
 
@@ -1713,29 +1709,5 @@
 
 	<separator/>
-	
-	<group name="Health" icon="presets/pharmacy.png">
-		<item name="Pharmacy" icon="presets/pharmacy.png">
-			<label text="Edit Pharmacy" />
-			<key key="amenity" value="pharmacy" />
-			<combo key="dispensing" text="Dispensing" values="yes,no" default="no" delete_if_empty="true" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Hospital" icon="presets/hospital.png">
-			<label text="Edit Hospital" />
-			<key key="amenity" value="hospital" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Emergency Access Point" icon="presets/emergency_access_point.png">
-			<label text="Edit Emergency Access Point" />
-			<label text=" " />
-			<key key="highway" value="emergency_access_point" />
-			<text key="ref" text="Point Number" default="" delete_if_empty="true" />
-			<text key="phone" text="Phone Number" default="" delete_if_empty="true" />
-			<label text="(Use international code, like +12-345-67890)" />
-			<label text=" " />
-		</item>
-	</group> <!-- Health -->
+
 
 	<group name="Buildings" icon="presets/townhall.png">
@@ -1846,5 +1818,125 @@
 		</item>
 
+		<separator/>
+		
+		<item name="Addresses" icon="presets/addresses.png">
+			<label text="Edit address information" />
+			<label text=" " />
+			<text key="addr:housenumber" text="House number" default="" delete_if_empty="true" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="addr:housename" text="House name" default="" delete_if_empty="true" />
+			<text key="addr:street" text="Street name" use_last_as_default="true" delete_if_empty="true" />
+			<text key="addr:city" text="City name" use_last_as_default="true" delete_if_empty="true" />
+			<text key="addr:postcode" text="Post code" use_last_as_default="true" delete_if_empty="true" />
+		</item>
+		
+		<item name="Address Interpolation" icon="presets/addresses.png">
+			<label text="Edit address interpolation" />
+			<label text=" " />
+			<combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all" default="odd" />
+		</item>
+
 	</group> <!-- Buildings -->
+
+	<group name="Man Made" icon="presets/works.png">
+		<item name="Works" icon="presets/works.png">
+			<label text="Edit Works" />
+			<key key="man_made" value="works" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Tower" icon="presets/tower.png">
+			<label text="Edit Tower" />
+			<key key="man_made" value="tower" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Water Tower" icon="presets/water_tower.png">
+			<label text="Edit Water Tower" />
+			<key key="man_made" value="water_tower" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Power Tower" icon="presets/power_tower.png">
+			<label text="Edit Power Tower" />
+			<key key="power" value="tower" />
+		</item>
+		
+		<item name="Power Generator" icon="presets/power_tower.png">
+			<label text="Edit Power Generator" />
+			<key key="power" value="generator" />
+			<combo key="power_source" text="Type" values="wind,hydro,fossil,nuclear" default="" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Gasometer" icon="presets/gasometer.png">
+			<label text="Edit Gasometer" />
+			<key key="man_made" value="gasometer" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Covered Reservoir" icon="presets/reservoir_covered.png">
+			<label text="Edit Covered Reservoir" />
+			<key key="man_made" value="reservoir_covered" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Lighthouse" icon="presets/lighthouse.png">
+			<label text="Edit Lighthouse" />
+			<key key="man_made" value="lighthouse" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Windmill" icon="presets/windmill.png">
+			<label text="Edit Windmill" />
+			<key key="man_made" value="windmill" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Pier" icon="presets/pier.png">
+			<label text="Edit Pier" />
+			<key key="man_made" value="pier" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Pipeline" icon="presets/empty.png">
+			<label text="Edit Pipeline" />
+			<key key="man_made" value="pipeline" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Wastewater Plant" icon="presets/wastewater_plant.png">
+			<label text="Edit Wastewater Plant" />
+			<key key="man_made" value="wastewater_plant" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Crane" icon="presets/crane.png">
+			<label text="Edit Crane" />
+			<key key="man_made" value="crane" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Beacon" icon="presets/empty.png">
+			<label text="Edit Beacon" />
+			<key key="man_made" value="beacon" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Survey Point" icon="presets/survey_point.png">
+			<label text="Edit Survey Point" />
+			<key key="man_made" value="survey_point" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Surveillance" icon="presets/surveillance.png">
+			<label text="Edit Surveillance Camera" />
+			<key key="man_made" value="surveillance" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+	</group> <!-- Man Made -->
+
 
 	<group name="Amenities" icon="presets/telephone.png">
@@ -1884,4 +1976,16 @@
 		</item>
 
+		<item name="Bench" icon="presets/bench.png">
+			<key key="amenity" value="bench" />
+		</item>
+
+		<item name="Hunting Stand" icon="presets/hunting_stand.png">
+			<label text="Edit a Hunting Stand" />
+			<key key="amenity" value="hunting_stand" />
+			<check key="shelter" text="Shelter" default="off" delete_if_empty="true" />
+			<check key="hide" text="Hide" default="off" delete_if_empty="true" />
+			<check key="lock" text="Lock" default="off" delete_if_empty="true" />
+			<combo key="height" text="Height" values="low,half,full,5,10,15,20" default="" delete_if_empty="true" />
+		</item>
 
 		<item name="Taxi" icon="presets/taxi.png">
@@ -1910,25 +2014,4 @@
 		</item>
 	</group> <!-- Amenities -->
-
-	<group name="Cash" icon="presets/dollar.png">
-		<item name="Bank" icon="presets/bank.png">
-			<label text="Edit Bank" />
-			<key key="amenity" value="bank" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<check key="atm" text="Automated Teller Machine" default="on" delete_if_empty="true" />
-		</item>
-
-		<item name="Money Exchange" icon="presets/coins.png">
-			<label text="Edit Money Exchange" />
-			<key key="amenity" value="bureau_de_change" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Automated Teller Machine" icon="presets/cash.png">
-			<label text="Edit Automated Teller Machine" />
-			<key key="amenity" value="atm" />
-			<text key="name" text="Provider" default="" delete_if_empty="true" />
-		</item>
-	</group> <!-- Cash -->
 
 	<group name="Shops" icon="presets/shopping.png">
@@ -2003,4 +2086,51 @@
 	</group> <!-- Shops -->
 
+	<group name="Cash" icon="presets/dollar.png">
+		<item name="Bank" icon="presets/bank.png">
+			<label text="Edit Bank" />
+			<key key="amenity" value="bank" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<check key="atm" text="Automated Teller Machine" default="on" delete_if_empty="true" />
+		</item>
+		
+		<item name="Money Exchange" icon="presets/coins.png">
+			<label text="Edit Money Exchange" />
+			<key key="amenity" value="bureau_de_change" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Automated Teller Machine" icon="presets/cash.png">
+			<label text="Edit Automated Teller Machine" />
+			<key key="amenity" value="atm" />
+			<text key="name" text="Provider" default="" delete_if_empty="true" />
+		</item>
+	</group> <!-- Cash -->
+
+
+	<group name="Health" icon="presets/pharmacy.png">
+		<item name="Pharmacy" icon="presets/pharmacy.png">
+			<label text="Edit Pharmacy" />
+			<key key="amenity" value="pharmacy" />
+			<combo key="dispensing" text="Dispensing" values="yes,no" default="no" delete_if_empty="true" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Hospital" icon="presets/hospital.png">
+			<label text="Edit Hospital" />
+			<key key="amenity" value="hospital" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+		
+		<item name="Emergency Access Point" icon="presets/emergency_access_point.png">
+			<label text="Edit Emergency Access Point" />
+			<label text=" " />
+			<key key="highway" value="emergency_access_point" />
+			<text key="ref" text="Point Number" default="" delete_if_empty="true" />
+			<text key="phone" text="Phone Number" default="" delete_if_empty="true" />
+			<label text="(Use international code, like +12-345-67890)" />
+			<label text=" " />
+		</item>
+	</group> <!-- Health -->
+
 	<separator/>
 
@@ -2090,24 +2220,4 @@
 		</item>
 
-		<separator/>
-
-		<item name="Addresses" icon="presets/addresses.png">
-			<label text="Edit address information" />
-			<label text=" " />
-			<text key="addr:housenumber" text="House number" default="" delete_if_empty="true" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="addr:housename" text="House name" default="" delete_if_empty="true" />
-			<text key="addr:street" text="Street name" use_last_as_default="true" delete_if_empty="true" />
-			<text key="addr:city" text="City name" use_last_as_default="true" delete_if_empty="true" />
-			<text key="addr:postcode" text="Post code" use_last_as_default="true" delete_if_empty="true" />
-		</item>
-
-		<item name="Address Interpolation" icon="presets/addresses.png">
-			<label text="Edit address interpolation" />
-			<label text=" " />
-			<combo key="addr:interpolation" text="Numbering scheme" values="odd,even,all" default="odd" />
-		</item>
 	</group> <!-- Places -->
 
@@ -2436,100 +2546,3 @@
 	</group> <!-- Natural -->
 
-	<group name="Man Made" icon="presets/works.png">
-		<item name="Works" icon="presets/works.png">
-			<label text="Edit Works" />
-			<key key="man_made" value="works" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-		
-		<item name="Tower" icon="presets/tower.png">
-			<label text="Edit Tower" />
-			<key key="man_made" value="tower" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Water Tower" icon="presets/water_tower.png">
-			<label text="Edit Water Tower" />
-			<key key="man_made" value="water_tower" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Power Tower" icon="presets/power_tower.png">
-			<label text="Edit Power Tower" />
-			<key key="power" value="tower" />
-		</item>
-
-		<item name="Power Generator" icon="presets/power_tower.png">
-			<label text="Edit Power Generator" />
-			<key key="power" value="generator" />
-			<combo key="power_source" text="Type" values="wind,hydro,fossil,nuclear" default="" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Gasometer" icon="presets/gasometer.png">
-			<label text="Edit Gasometer" />
-			<key key="man_made" value="gasometer" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Covered Reservoir" icon="presets/reservoir_covered.png">
-			<label text="Edit Covered Reservoir" />
-			<key key="man_made" value="reservoir_covered" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Lighthouse" icon="presets/lighthouse.png">
-			<label text="Edit Lighthouse" />
-			<key key="man_made" value="lighthouse" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Windmill" icon="presets/windmill.png">
-			<label text="Edit Windmill" />
-			<key key="man_made" value="windmill" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Pier" icon="presets/pier.png">
-			<label text="Edit Pier" />
-			<key key="man_made" value="pier" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Pipeline" icon="presets/empty.png">
-			<label text="Edit Pipeline" />
-			<key key="man_made" value="pipeline" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Wastewater Plant" icon="presets/wastewater_plant.png">
-			<label text="Edit Wastewater Plant" />
-			<key key="man_made" value="wastewater_plant" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Crane" icon="presets/crane.png">
-			<label text="Edit Crane" />
-			<key key="man_made" value="crane" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Beacon" icon="presets/empty.png">
-			<label text="Edit Beacon" />
-			<key key="man_made" value="beacon" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Survey Point" icon="presets/survey_point.png">
-			<label text="Edit Survey Point" />
-			<key key="man_made" value="survey_point" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Surveillance" icon="presets/surveillance.png">
-			<label text="Edit Surveillance Camera" />
-			<key key="man_made" value="surveillance" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-	</group> <!-- Man Made -->
 </annotations>