Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 12930)
+++ trunk/data/defaultpresets.xml	(revision 12934)
@@ -286,10 +286,13 @@
         <text key="branch" text="Branch operator" />
     </chunk>
-    <chunk id="cable_circuit">
+    <chunk id="cables">
         <combo key="cables" text="Amount of Cables" values="1,2,3,4,6,9,12" />
+    </chunk>
+    <chunk id="cables_circuits">
+        <reference ref="cables" />
         <combo key="circuits" text="Amount of circuits" values="1,2,3,4" />
     </chunk>
     <chunk id="power_loc">
-        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,kiosk" values_context="power" />
+        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,rooftop,kiosk" values_context="power" />
     </chunk>
     <chunk id="power_extra">
@@ -299,5 +302,5 @@
     </chunk>
     <chunk id="power_line_extra">
-        <reference ref="cable_circuit" />
+        <reference ref="cables_circuits" />
         <reference ref="voltage_frequency" />
     </chunk>
@@ -7607,4 +7610,11 @@
             <space />
             <key key="power" value="switch" />
+            <combo key="switch" text="Type of switch" values="mechanical,circuit_breaker,disconnector,earthing" match="key" values_context="power" />
+            <reference ref="power_loc" />
+            <optional>
+                <reference ref="voltage" />
+                <reference ref="cables" />
+                <reference ref="ref_operator_branch" />
+            </optional>
         </item> <!-- Power Switch -->
         <separator/>
@@ -7762,5 +7772,5 @@
             <reference ref="ref_operator_branch" />
             <optional>
-                <reference ref="cable_circuit" />
+                <reference ref="cables_circuits" />
                 <combo key="wires" text="Number of conductors/wires per cable" values="single,double,triple,quad,fivefold,sixfold,eightfold" values_context="power" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -7778,5 +7788,5 @@
             <reference ref="ref_operator_branch" />
             <optional>
-                <reference ref="cable_circuit" />
+                <reference ref="cables_circuits" />
                 <combo key="location" text="Location" values="underground,underwater,overground" values_context="power cable" />
                 <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
@@ -10558,5 +10568,5 @@
             <space />
             <key key="landuse" value="vineyard" />
-            <combo key="crop" text="Crop" values="grape" default="grape" values_context="crop" />
+            <key key="crop" value="grape" match="keyvalue" />
             <reference ref="optional_name" />
         </item> <!-- Vineyard -->