Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 15646)
+++ /trunk/data/defaultpresets.xml	(revision 15647)
@@ -525,4 +525,7 @@
     <combo key="nudism" text="Nudism" values="yes,no,obligatory,designated,customary,permissive" />
   </chunk>
+  <chunk id="wall_material">
+    <combo key="material" text="Material" values="adobe,brick,concrete,masonry,reinforced_concrete,stone" />
+  </chunk>
   <!--  Groups -->
   <group name="Highways" icon="presets/transport/way/way_secondary.svg">
@@ -1318,5 +1321,5 @@
             <optional>
                 <text key="maxwidth" text="Max. width (meters)" length="7" />
-                <combo key="material" text="Material" values="concrete,stone" />
+                <combo key="material" text="Material" values="concrete,reinforced_concrete,stone" />
             </optional>
         </item> <!-- Block -->
@@ -1408,4 +1411,5 @@
             <reference ref="optional_height" />
             <combo key="wall" text="Type" values="castle_wall,dry_stone,flood_wall,noise_barrier,seawall" />
+            <reference ref="wall_material" />
         </item> <!-- Wall -->
         <item name="City Wall" icon="presets/barrier/city_wall.svg" type="way,closedway" preset_name_label="true">
@@ -1413,4 +1417,5 @@
             <key key="barrier" value="city_wall" />
             <reference ref="optional_height" />
+            <reference ref="wall_material" />
         </item> <!-- City Wall -->
         <item name="Retaining Wall" icon="presets/barrier/retaining_wall.svg" type="way,closedway" preset_name_label="true">
@@ -1418,4 +1423,5 @@
             <key key="barrier" value="retaining_wall" />
             <reference ref="optional_height" />
+            <reference ref="wall_material" />
         </item> <!-- Retaining Wall -->
         <item name="Jersey Barrier" icon="presets/barrier/jersey_barrier.svg"  type="node,way,closedway" preset_name_label="true">
@@ -3469,5 +3475,5 @@
             <text key="artwork_subject" text="Subject" />
             <text key="artist_name" text="Artist Name" />
-            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+            <combo key="material" text="Material" values="brass,bronze,concrete,glass,granite,metal,plastic,steel,stone,wood" />
             <text key="start_date" text="Start date" />
         </item> <!-- Artwork -->
@@ -5079,4 +5085,5 @@
             <text key="ref" text="Reference" />
             <text key="ele" text="Elevation" />
+            <combo key="material" text="Material" values="andesite,brass,bronze,concrete,granite,metal,steel,stone" />
         </item> <!-- Survey Point -->
         <item name="Surveillance Camera" icon="presets/service/surveillance.svg" type="node" preset_name_label="true">
@@ -5660,5 +5667,5 @@
                 <text key="inscription" text="Inscription" />
                 <text key="artist_name" text="Artist Name" />
-                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
+                <combo key="material" text="Material" values="concrete,granite,metal,plastic,steel,stone,wood" />
                 <text key="start_date" text="Start date" />
                 <text key="wikipedia" text="Wikipedia" />