Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(revision 14053)
+++ data/defaultpresets.xml	(working copy)
@@ -6581,17 +6581,99 @@
             <reference ref="name_operator" />
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
         </item> <!-- Running -->
-        <item name="Climbing" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
-            <link href="https://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
-                  de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing"
-                  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:sport=climbing"
-                  it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:sport=climbing"
-                  pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:sport=climbing" />
-            <space />
-            <key key="sport" value="climbing" />
-            <text key="name" text="Name" />
-            <combo key="leisure" text="Type" values="sports_centre" />
-        </item> <!-- Climbing -->
+		<item name="Climbing on natural structures" de.name="Klettern an natürlichen Strukturen" icon="presets/sport/climbing.svg"
+			  type="node,way,closedway,multipolygon" preset_name_label="true">
+			<link href="https://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
+				  de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing"
+				  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:sport=climbing"
+				  it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:sport=climbing"
+				  pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:sport=climbing" />
+			<space />
+			<key key="sport" value="climbing" />
+			<text key="name" text="Name" de.text="Name"/>
+			<checkgroup columns="2">
+				<check key="climbing:boulder" text="Boulders" de.text="Bouldern" />
+				<check key="climbing:sport" text="Sport climbing" de.text="Sportklettern" />
+				<check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" de.text="Top rope (Zustieg + Einhängen des Seils von oben)" />
+				<check key="climbing:trad" text="Traditional climbing (no fixed anchors)" de.text="Traditionelles Klettern (keine festen Haken)" />
+				<check key="climbing:multipitch" text="Multi-pitch climbing" de.text="Mehrseillängen" />
+				<check key="climbing:ice" text="Ice climbing" de.text="Eisklettern" />
+				<check key="climbing:mixed" text="Mixed climbing" de.text="Mixedklettern" />
+				<check key="climbing:deepwater" text="Deep Water Soloing" de.text="Deep Water Soloing" />
+			</checkgroup>
+			
+			<space />
+			<combo key="climbing:bolted" text="Bolts (yes/no/distance)" de.text="Haken (ja/nein/Abstand)" values="yes,no,1 m,2 m,3 m,4 m,5 m,6 m" values_sort="false"/>
+			<text key="ele" text="Elevation of route bottom " de.text="Einstiegshöhe" />
+			<combo key="climbing:length" text="Usual route length (m)" de.text="Übliche Routenlänge (m)" values="10 m,15 m,20 m,25 m,30 m,35 m,40 m"/>
+			<combo key="climbing:length:min" text="Minimal climbing length (m)" de.text="Minimale Routenlänge (m)" values="10 m,15 m,20 m,25 m,30 m,35 m,40 m"/>
+			<combo key="climbing:length:max" text="Maximum climbing length (m)" de.text="Maximale Routenlänge (m)" values="10 m,15 m,20 m,25 m,30 m,35 m,40 m"/>
+			<space />
+			<combo key="climbing:orientation" text="Orientation" de.text="Ausrichtung" values="N,NE,E,SE,S,SW,W,NW" values_sort="false"/>
+			<combo key="climbing:quality" text="Rock/ice quality" de.text="Fels-/Eisqualität" values="fragile,medium,solid"
+					display_values="fragile,medium,solid" de.display_values="brüchig,mittel,stabil"/>
+			<!-- maybe change combo for rock to multiselect, so multiple rock types can be selected? But multiselect consumes more display space -->
+			<combo key="climbing:rock" text="Rock type" de.text="Felsart" rows="3" values="limestone,sandstone,granite,basalt,slate"
+				   display_values="limestone,sandstone,granite,basalt,slate" de.display_values="Kalkstein,Sandstein,Granit,Basalt,Schiefer" />
+			<text key="climbing:routes" text="Amount of routes" de.text="Anzahl Routen"  />
+			<check key="climbing:summit_log" text="Summit/route log" de.text="Gipfel-/Routenbuch"/>
+			<text key="climbing:grade:UIAA:min" text="UIAA: Simplest route" de.text="UIAA: Einfachste Route" />
+			<text key="climbing:grade:UIAA:max" text="UIAA: Most difficult route" de.text="UIAA: Schwerste Route" />
+			<text key="climbing:grade:UIAA:mean" text="UIAA: Main difficulty" de.text="UIAA: Haupt-Schwierigkeit" />
+			<text key="climbing:grade:french:min" text="French: Simplest route" de.text="Franz.: Einfachste Route" />
+			<text key="climbing:grade:french:max" text="French: Most difficult route" de.text="Franz.: Schwerste Route" />
+			<text key="climbing:grade:french:mean" text="French: Main difficulty" de.text="Franz.: Haupt-Schwierigkeit" />
+			<check key="indoor" text="Climbing routes indoor" de.text="Kletterrouten drinnen" default="off" />
+			<check key="outdoor" text="Climbing routes outdoor" de.text="Kletterrouten draußen" default="on" />			
+			<text key="website" text="Official web site (e.g. operator)" de.text="Offizielle Website (z.B. Betreiber)" />
+			<text key="url" text="Unofficial web site (URL)" de.text="Inoffizielle Website (URL)" />
+			<combo key="opening_hours" text="Opening hours" de.text="Öffnungszeiten"
+				   values="24/7,sunset-sunrise open; sunrise-sunset closed;,Mar-Jun: closed; Jul-Feb: open;"  default="24/7"  values_no_i18n="true"/>
+			<combo key="fee" text="Fee" de.text="Gebühr" values="yes,no,Sa-Su 08:00-20:00"/>
+			<combo key="access" text="Access" de.text="Zugang" values="yes,no,customers,private" />
+		</item> <!-- Climbing on natural structures -->		
+		<item name="Climbing on artificial structures" de.name="Klettern an künstlichen Strukturen" icon="presets/sport/climbing.svg" 
+			  type="node,way,closedway,multipolygon" preset_name_label="true">
+			<link href="https://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
+				  de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing"
+				  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:sport=climbing"
+				  it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:sport=climbing"
+				  pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:sport=climbing" />
+			<key key="sport" value="climbing" /> 
+			<key key="leisure" value="sports_centre" />
+			<text key="name" text="Name" de.text="Name"/>
+			<checkgroup columns="2">
+				<check key="climbing:boulder" text="Boulders" de.text="Bouldern" />
+				<check key="climbing:sport" text="Sport climbing" de.text="Sportklettern" />
+				<check key="climbing:multipitch" text="Multi-pitch climbing" de.text="Mehrseillängen" />      
+				<check key="climbing:ice" text="Ice climbing" de.text="Eisklettern" />
+				<check key="climbing:mixed" text="Mixed climbing" de.text="Mixedklettern" />
+				<check key="climbing:deepwater" text="Deep Water Soloing" de.text="Deep Water Soloing" />
+			</checkgroup>
+			<space />
+			<combo key="climbing:length" text="Usual route length (m)" de.text="Übliche Routenlänge (m)" values="8 m,10 m,12 m,15 m,20 m,25 m,30 m"/>
+			<combo key="climbing:length:min" text="Minimal climbing length (m)" de.text="Minimale Routenlänge (m)" values="8 m,10 m,12 m,15 m,20 m,25 m,30 m"/>
+			<combo key="climbing:length:max" text="Maximum climbing length (m)" de.text="Maximale Routenlänge (m)" values="8 m,10 m,12 m,15 m,20 m,25 m,30 m"/>
+			<combo key="climbing:orientation" text="Orientation" de.text="Ausrichtung" values="N,NE,E,SE,S,SW,W,NW" values_sort="false"/>
+			<text key="climbing:routes" text="Amount of routes" de.text="Anzahl Routen"  />
+			<space />
+			<text key="climbing:grade:UIAA:min" text="UIAA: Simplest route" de.text="UIAA: Einfachste Route" />
+			<text key="climbing:grade:UIAA:max" text="UIAA: Most difficult route" de.text="UIAA: Schwerste Route" />
+			<text key="climbing:grade:UIAA:mean" text="UIAA: Main difficulty" de.text="UIAA: Haupt-Schwierigkeit" />
+			<text key="climbing:grade:french:min" text="French: Simplest route" de.text="Franz.: Einfachste Route" />
+			<text key="climbing:grade:french:max" text="French: Most difficult route" de.text="Franz.: Schwerste Route" />
+			<text key="climbing:grade:french:mean" text="French: Main difficulty" de.text="Franz.: Haupt-Schwierigkeit" />
+			<checkgroup columns="2">
+				<check key="indoor" text="Climbing routes indoor" de.text="Kletterrouten drinnen" default="on" />
+				<check key="building" text="Building" de.text="Gebäude" /> 
+			</checkgroup>
+			<check key="outdoor" text="Climbing routes outdoor" de.text="Kletterrouten draußen" default="off" />		
+			<text key="website" text="Official web site (e.g. operator)" de.text="Offizielle Website (z.B. Betreiber)" />
+			<text key="url" text="Unofficial web site (URL)" de.text="Inoffizielle Website (URL)" />
+			<combo key="opening_hours" text="Opening hours" de.text="Öffnungszeiten" values="Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00"  />
+			<combo key="fee" text="Fee" de.text="Gebühr" values="yes,no,Sa-Su 08:00-20:00"/>
+			<combo key="access" text="Access" de.text="Zugang" values="yes,no,customers,private"  />
+        </item> <!-- Climbing on artificial structures -->
         <item name="Canoeing/Kayaking" icon="presets/sport/canoe.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
             <space />