Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 11541)
+++ trunk/data/defaultpresets.xml	(revision 11547)
@@ -5200,4 +5200,9 @@
             <combo key="access" text="Access rights" values="yes,permissive,customers" />
             <optional>
+			    <checkgroup columns="3">
+                    <check key="female" text="Female" text_context="restroom" />
+                    <check key="male" text="Male" text_context="restroom" />
+                    <check key="unisex" text="Unisex" text_context="restroom" />
+                </checkgroup>
                 <text key="description" text="Description" />
                 <combo key="fee" text="Fee" values="yes,no" />
@@ -7115,4 +7120,5 @@
             <space />
             <key key="historic" value="castle" />
+			<combo key="castle_type" text="Type" values="stately,defensive,fortress,manor,palace" />
             <reference ref="name_wikipedia" />
             <check key="ruins" text="Ruins" />