diff --git a/Aircraft/Instruments/brakes.xml b/Aircraft/Instruments/brakes.xml
index 8a4a2992a..0a5c9a39b 100644
--- a/Aircraft/Instruments/brakes.xml
+++ b/Aircraft/Instruments/brakes.xml
@@ -16,7 +16,7 @@
    <type>switch</type>
     <layer>
      <condition>
-      <property>/controls[0]/parking-brake</property> <!-- nose brake -->
+      <property>/controls/gear/parking-brake</property> <!-- parking brake -->
      </condition>
      <name>on</name>
      <texture>
@@ -73,7 +73,7 @@
    <h>26</h>
    <binding>
     <command>property-toggle</command>
-    <property>/controls/parking-brake</property>
+    <property>/controls/gear/parking-brake</property>
    </binding>
   </action>
  </actions>
diff --git a/Aircraft/Instruments/controls.xml b/Aircraft/Instruments/controls.xml
index 74bfeead2..7ada4eebf 100644
--- a/Aircraft/Instruments/controls.xml
+++ b/Aircraft/Instruments/controls.xml
@@ -53,7 +53,7 @@ properties' values.
    <transformations>
     <transformation>
      <type>x-shift</type>
-     <property>/controls/aileron</property>
+     <property>/controls/flight/aileron</property>
      <min>-1</min>
      <max>1</max>
      <scale>42</scale>
@@ -91,7 +91,7 @@ properties' values.
     </transformation>
     <transformation>
      <type>x-shift</type>
-     <property>/controls/rudder</property>
+     <property>/controls/flight/rudder</property>
      <min>-1</min>
      <max>1</max>
      <scale>42</scale>
@@ -127,7 +127,7 @@ properties' values.
     </transformation>
     <transformation>
      <type>x-shift</type>
-     <property>/controls/elevator-trim</property>
+     <property>/controls/flight/elevator-trim</property>
      <min>-1.0</min>
      <max>1.0</max>
      <scale>-42</scale>
@@ -161,7 +161,7 @@ properties' values.
     </transformation>
     <transformation>
      <type>x-shift</type>
-     <property>/controls/elevator</property>
+     <property>/controls/flight/elevator</property>
      <min>-1.0</min>
      <max>1.0</max>
      <scale>42</scale>
@@ -188,7 +188,7 @@ properties' values.
   <h>40</h>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step>0.01</step>
     <min>-1.0</min>
     <max>1.0</max>
@@ -204,7 +204,7 @@ properties' values.
   <h>40</h>
    <binding>
     <command>property-adjust</command>
-    <property>/controls/elevator-trim</property>
+    <property>/controls/flight/elevator-trim</property>
     <step>-0.01</step>
     <min>-1.0</min>
     <max>1.0</max>
@@ -221,7 +221,7 @@ properties' values.
    <h>20</h>
    <binding>
     <command>property-adjust</command>
-    <property>/controls/rudder-trim</property>
+    <property>/controls/flight/rudder-trim</property>
     <step>-0.005</step>
     <min>-1.0</min>
     <max>1.0</max>
@@ -237,7 +237,7 @@ properties' values.
    <h>20</h>
    <binding>
     <command>property-adjust</command>
-    <property>/controls/rudder-trim</property>
+    <property>/controls/flight/rudder-trim</property>
     <step>0.005</step>
     <min>-1.0</min>
     <max>1.0</max>
diff --git a/Aircraft/Instruments/jet-throttle-quadrant.xml b/Aircraft/Instruments/jet-throttle-quadrant.xml
index cdf1f97ef..13da127e7 100755
--- a/Aircraft/Instruments/jet-throttle-quadrant.xml
+++ b/Aircraft/Instruments/jet-throttle-quadrant.xml
@@ -38,11 +38,11 @@ Lee Elliott
  <h-base>70</h-base>
 
  <params>
-  <engine0-throttle-select>/controls/throttle[0]</engine0-throttle-select>
-  <engine1-throttle-select>/controls/throttle[1]</engine1-throttle-select>
-  <flaps-select>/controls/flaps</flaps-select>
-  <engine0-reheat-select>/controls/afterburner[0]</engine0-reheat-select>
-  <engine1-reheat-select>/controls/afterburner[1]</engine1-reheat-select>
+  <engine0-throttle-select>/controls/engines/engine[0]/throttle</engine0-throttle-select>
+  <engine1-throttle-select>/controls/engines/engine[1]/throttle</engine1-throttle-select>
+  <flaps-select>/controls/flight/flaps</flaps-select>
+  <engine0-reheat-select>/controls/engines/engine[0]/augmentation</engine0-reheat-select>
+  <engine1-reheat-select>/controls/engines/engine[1]/augmentation</engine1-reheat-select>
  </params>
 
  <layers>
diff --git a/Aircraft/Instruments/magneto-switch.xml b/Aircraft/Instruments/magneto-switch.xml
index f98e330d2..c6d0e7784 100644
--- a/Aircraft/Instruments/magneto-switch.xml
+++ b/Aircraft/Instruments/magneto-switch.xml
@@ -10,10 +10,10 @@
  <h-base>72</h-base>
 
  <params>
-  <magneto0-select>/controls/magnetos[0]</magneto0-select>
-  <starter0-select>/controls/starter[0]</starter0-select>
-  <magneto1-select>/controls/magnetos[1]</magneto1-select>
-  <starter1-select>/controls/starter[1]</starter1-select>
+  <magneto0-select>/controls/engines/engine[0]/magnetos</magneto0-select>
+  <starter0-select>/controls/engines/engine[0]/starter</starter0-select>
+  <magneto1-select>/controls/engines/engine[0]/magnetos</magneto1-select>
+  <starter1-select>/controls/engines/engine[1]/starter</starter1-select>
  </params>
 
  <layers>
diff --git a/Aircraft/Instruments/mixture-knob.xml b/Aircraft/Instruments/mixture-knob.xml
index a53abae9e..e0f6f76bf 100644
--- a/Aircraft/Instruments/mixture-knob.xml
+++ b/Aircraft/Instruments/mixture-knob.xml
@@ -29,7 +29,7 @@ properties' values.
  <w-base>64</w-base>
  <h-base>72</h-base>
  <params> 
-  <engine-mixture-select>/controls/mixture[0]</engine-mixture-select>
+  <engine-mixture-select>/controls/engines/engine[0]/mixture</engine-mixture-select>
  </params>
  <layers>
   <layer>
diff --git a/Aircraft/Instruments/propeller-knob.xml b/Aircraft/Instruments/propeller-knob.xml
index 6a44d3c3c..3549bb17a 100644
--- a/Aircraft/Instruments/propeller-knob.xml
+++ b/Aircraft/Instruments/propeller-knob.xml
@@ -13,7 +13,7 @@ Started Winter 2002 by David Megginson, david@megginson.com.
  <h-base>72</h-base>
 
  <params>
-  <engine-propeller-select>/controls/propeller-pitch[0]</engine-propeller-select>
+  <engine-propeller-select>/controls/engines/engine[0]/propeller-pitch</engine-propeller-select>
  </params>
  
  <layers>
diff --git a/Aircraft/Instruments/single-magneto-switch.xml b/Aircraft/Instruments/single-magneto-switch.xml
index 22c120d99..829f70bde 100644
--- a/Aircraft/Instruments/single-magneto-switch.xml
+++ b/Aircraft/Instruments/single-magneto-switch.xml
@@ -10,8 +10,8 @@
  <h-base>72</h-base>
 
  <params>
-  <magneto-select>/controls/magnetos[0]</magneto-select>
-  <starter-select>/controls/starter[0]</starter-select>
+  <magneto-select>/controls/engines/engine[0]/magnetos</magneto-select>
+  <starter-select>/controls/engines/engine[0]/starter</starter-select>
  </params>
 
  <layers>
diff --git a/Aircraft/Instruments/single-reheat-quadrant.xml b/Aircraft/Instruments/single-reheat-quadrant.xml
index 84dbe91d7..717bb19ae 100755
--- a/Aircraft/Instruments/single-reheat-quadrant.xml
+++ b/Aircraft/Instruments/single-reheat-quadrant.xml
@@ -34,7 +34,7 @@ Hacked to create a single reheat quadrant.
  <h-base>70</h-base>
 
  <params>
-  <engine-reheat-select>/controls/afterburner[0]</engine-reheat-select>
+  <engine-reheat-select>/controls/engines/engine[0]/augmentation</engine-reheat-select>
  </params>
 
  <layers>
diff --git a/Aircraft/Instruments/single-step-flap-quadrant.xml b/Aircraft/Instruments/single-step-flap-quadrant.xml
index fe824b302..001f2c214 100755
--- a/Aircraft/Instruments/single-step-flap-quadrant.xml
+++ b/Aircraft/Instruments/single-step-flap-quadrant.xml
@@ -35,7 +35,7 @@ extended/retracted in a single step.
  <h-base>70</h-base>
 
  <params>
-  <flaps-select>/controls/flaps</flaps-select>
+  <flaps-select>/controls/flight/flaps</flaps-select>
  </params>
 
  <layers>
diff --git a/Aircraft/Instruments/single-throttle-quadrant.xml b/Aircraft/Instruments/single-throttle-quadrant.xml
index a086cddce..417beb16b 100755
--- a/Aircraft/Instruments/single-throttle-quadrant.xml
+++ b/Aircraft/Instruments/single-throttle-quadrant.xml
@@ -34,7 +34,7 @@ Hacked to create a single throttle quadrant.
  <h-base>70</h-base>
 
  <params>
-  <engine-throttle-select>/controls/throttle[0]</engine-throttle-select>
+  <engine-throttle-select>/controls/engines/engine[0]/throttle</engine-throttle-select>
  </params>
 
  <layers>
diff --git a/Aircraft/Instruments/three-step-flap-quadrant.xml b/Aircraft/Instruments/three-step-flap-quadrant.xml
index 304f3b11b..88c5770cb 100755
--- a/Aircraft/Instruments/three-step-flap-quadrant.xml
+++ b/Aircraft/Instruments/three-step-flap-quadrant.xml
@@ -35,7 +35,7 @@ extended/retracted in three steps.
  <h-base>70</h-base>
 
  <params>
-  <flaps-select>/controls/flaps</flaps-select>
+  <flaps-select>/controls/flight/flaps</flaps-select>
  </params>
 
  <layers>
diff --git a/Aircraft/Instruments/throttle-knob.xml b/Aircraft/Instruments/throttle-knob.xml
index 1540101bf..57a1955de 100644
--- a/Aircraft/Instruments/throttle-knob.xml
+++ b/Aircraft/Instruments/throttle-knob.xml
@@ -30,7 +30,7 @@ properties' values.
  <h-base>72</h-base>
 
  <params>
-  <engine-throttle-select>/controls/throttle[0]</engine-throttle-select>
+  <engine-throttle-select>/controls/engines/engine[0]/throttle</engine-throttle-select>
  </params>
  
  <layers>
diff --git a/Aircraft/Instruments/throttle-quadrant.xml b/Aircraft/Instruments/throttle-quadrant.xml
index 6eb852d66..5c420778d 100644
--- a/Aircraft/Instruments/throttle-quadrant.xml
+++ b/Aircraft/Instruments/throttle-quadrant.xml
@@ -29,12 +29,12 @@ properties' values.
  <h-base>70</h-base>
 
  <params>
-  <engine-throttle0-select>/controls/throttle[0]</engine-throttle0-select>
-  <engine-throttle1-select>/controls/throttle[1]</engine-throttle1-select>
-  <prop-advance0-select>/controls/propeller-pitch[0]</prop-advance0-select>
-  <prop-advance1-select>/controls/propeller-pitch[1]</prop-advance1-select>
-  <engine-mixture0-select>/controls/mixture[0]</engine-mixture0-select>
-  <engine-mixture1-select>/controls/mixture[1]</engine-mixture1-select>
+  <engine-throttle0-select>/controls/engines/engine[0]/throttle</engine-throttle0-select>
+  <engine-throttle1-select>/controls/engines/engine[1]/throttle</engine-throttle1-select>
+  <prop-advance0-select>/controls/engines/engine[0]/propeller-pitch</prop-advance0-select>
+  <prop-advance1-select>/controls/engines/engine[1]/propeller-pitch</prop-advance1-select>
+  <engine-mixture0-select>/controls/engines/engine[0]/mixture</engine-mixture0-select>
+  <engine-mixture1-select>/controls/engines/engine[1]/mixture</engine-mixture1-select>
  </params>
 
  <layers>
diff --git a/Aircraft/Instruments/twin-magneto-switch.xml b/Aircraft/Instruments/twin-magneto-switch.xml
index ef01debc4..3f541760f 100644
--- a/Aircraft/Instruments/twin-magneto-switch.xml
+++ b/Aircraft/Instruments/twin-magneto-switch.xml
@@ -10,10 +10,10 @@
  <h-base>72</h-base>
 
  <params>
-  <magneto0-select>/controls/magnetos[0]</magneto0-select>
-  <starter0-select>/controls/starter[0]</starter0-select>
-  <magneto1-select>/controls/magnetos[1]</magneto1-select>
-  <starter1-select>/controls/starter[1]</starter1-select>
+  <magneto0-select>/controls/engines/engine[0]/magnetos</magneto0-select>
+  <starter0-select>/controls/engines/engine[0]/starter</starter0-select>
+  <magneto1-select>/controls/engines/engine[1]/magnetos</magneto1-select>
+  <starter1-select>/controls/engines/engine[1]/starter</starter1-select>
  </params>
 
  <layers>
diff --git a/Input/Joysticks/CH/pro-pedals-usb.xml b/Input/Joysticks/CH/pro-pedals-usb.xml
index 1364d22cc..03c463aaa 100644
--- a/Input/Joysticks/CH/pro-pedals-usb.xml
+++ b/Input/Joysticks/CH/pro-pedals-usb.xml
@@ -22,7 +22,7 @@
  <axis n="0">
   <binding>
    <command>property-scale</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <offset>1.0</offset>
    <factor>0.5</factor>
   </binding>
@@ -31,7 +31,7 @@
  <axis n="1">
   <binding>
    <command>property-scale</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <offset>1.0</offset>
    <factor>0.5</factor>
   </binding>
@@ -40,10 +40,9 @@
  <axis n="2">
   <binding>
    <command>property-scale</command>
-   <property>/controls/rudder</property>
+   <property>/controls/flight/rudder</property>
    <factor>1.0</factor>
    <offset>0.0</offset>
-   <power>2.0</power>
   </binding>
  </axis>
 
diff --git a/Input/Joysticks/CH/pro-yoke-usb.xml b/Input/Joysticks/CH/pro-yoke-usb.xml
index 5d3bd9db5..b9bb34249 100644
--- a/Input/Joysticks/CH/pro-yoke-usb.xml
+++ b/Input/Joysticks/CH/pro-yoke-usb.xml
@@ -34,7 +34,7 @@
   <desc>Aileron</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <power>2.0</power>
   </binding>
  </axis>
@@ -43,7 +43,7 @@
   <desc>Elevator</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <factor type="double">-1.0</factor>
    <power>2.0</power>
   </binding>
@@ -53,13 +53,13 @@
   <desc>Throttle</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
+   <property>/controls/engines/engine[0]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
+   <property>/controls/engines/engine[1]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -69,13 +69,13 @@
   <desc>Mixture</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/mixture[0]</property>
+   <property>/controls/engines/engine[0]/mixture</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/mixture[1]</property>
+   <property>/controls/engines/engine[1]/mixture</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -85,13 +85,13 @@
   <desc>Propeller</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/propeller-pitch[0]</property>
+   <property>/controls/engines/engine[0]/propeller-pitch</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/propeller-pitch[1]</property>
+   <property>/controls/engines/engine[1]/propeller-pitch</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -124,7 +124,7 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/rudder-trim</property>
+   <property>/controls/flight/rudder-trim</property>
    <step>0.001</step>
   </binding>
  </button>
@@ -133,7 +133,7 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/rudder-trim</property>
+   <property>/controls/flight/rudder-trim</property>
    <step>-0.001</step>
   </binding>
  </button>
@@ -142,7 +142,7 @@
   <repeatable>false</repeatable>
   <binding>
    <command>property-assign</command>
-   <property>/controls/gear-down</property>
+   <property>/controls/gear/gear-down</property>
    <value>false</value>
   </binding>
  </button>
@@ -151,7 +151,7 @@
   <repeatable>false</repeatable>
   <binding>
    <command>property-assign</command>
-   <property>/controls/gear-down</property>
+   <property>/controls/gear/gear-down</property>
    <value>true</value>
   </binding>
  </button>
@@ -160,7 +160,7 @@
   <repeatable>false</repeatable>
   <binding>
    <command>property-assign</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <value type="double">0.0</value>
   </binding>
  </button>
@@ -169,7 +169,7 @@
   <repeatable>false</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">0.34</step>
   </binding>
  </button>
@@ -178,7 +178,7 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step>0.001</step>
   </binding>
  </button>
@@ -187,7 +187,7 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step>-0.001</step>
   </binding>
  </button>
diff --git a/Input/Joysticks/Default/joystick.xml b/Input/Joysticks/Default/joystick.xml
index 54b3f7a70..0e2224118 100644
--- a/Input/Joysticks/Default/joystick.xml
+++ b/Input/Joysticks/Default/joystick.xml
@@ -15,7 +15,7 @@ joystick, and that the first button is the trigger.
   <desc>Aileron</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <squared type="bool">true</squared>
   </binding>
  </axis>
@@ -24,7 +24,7 @@ joystick, and that the first button is the trigger.
   <desc>Elevator</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <factor type="double">-1.0</factor>
    <squared type="bool">true</squared>
   </binding>
@@ -34,13 +34,13 @@ joystick, and that the first button is the trigger.
   <desc>Throttle</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
+   <property>/controls/engines/engine[0]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
+   <property>/controls/engines/engine[1]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -50,33 +50,33 @@ joystick, and that the first button is the trigger.
   <desc>Brakes</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[2]</property>
+   <property>/controls/gear/wheel[2]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[2]</property>
+    <property>/controls/gear/wheel[2]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -87,7 +87,7 @@ joystick, and that the first button is the trigger.
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">0.001</step>
   </binding>
  </button>
@@ -97,7 +97,7 @@ joystick, and that the first button is the trigger.
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">-0.001</step>
   </binding>
  </button>
diff --git a/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml b/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml
index 6a7e06ccf..45ec41e25 100644
--- a/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml
+++ b/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml
@@ -29,7 +29,7 @@
   <desc>Aileron</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <squared type="bool">true</squared>
   </binding>
  </axis>
@@ -38,7 +38,7 @@
   <desc>Elevator</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <factor type="double">-1.0</factor>
    <squared type="bool">true</squared>
   </binding>
@@ -48,13 +48,13 @@
   <desc>Throttle</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
+   <property>/controls/engines/engine[0]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
+   <property>/controls/engines/engine[1]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -64,7 +64,7 @@
   <desc>Rudder</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/rudder</property>
+   <property>/controls/flight/rudder</property>
    <factor type="double">1.0</factor>
   </binding>
  </axis>
@@ -113,33 +113,33 @@
   <desc>Brakes</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[2]</property>
+   <property>/controls/gear/wheel[2]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[2]</property>
+    <property>/controls/gear/wheel[2]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -150,7 +150,7 @@
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">0.001</step>
   </binding>
  </button>
@@ -160,7 +160,7 @@
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">-0.001</step>
   </binding>
  </button>
@@ -170,7 +170,7 @@
   <repeatable>false</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">-0.34</step>
   </binding>
  </button>
@@ -180,7 +180,7 @@
   <repeatable>false</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">0.34</step>
   </binding>
  </button>
@@ -189,13 +189,13 @@
   <desc>Right brake</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -205,13 +205,13 @@
   <desc>Left brake</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
diff --git a/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml b/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml
index 8b6e61cc4..9d54108c8 100644
--- a/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml
+++ b/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml
@@ -31,7 +31,7 @@
   <desc>Aileron</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <squared>true</squared>
   </binding>
  </axis>
@@ -40,7 +40,7 @@
   <desc>Elevator</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <factor type="double">-1.0</factor>
    <squared>true</squared>
   </binding>
@@ -49,7 +49,7 @@
  <axis n="2">
   <binding>
    <command>property-scale</command>
-   <property>/controls/rudder</property>
+   <property>/controls/flight/rudder</property>
    <squared>true</squared>
   </binding>
  </axis>
@@ -58,13 +58,13 @@
   <desc>Throttle</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
+   <property>/controls/engines/engine[0]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
+   <property>/controls/engines/engine[1]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -90,33 +90,33 @@
   <desc>Brakes</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[2]</property>
+   <property>/controls/gear/wheel[2]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[2]</property>
+    <property>/controls/gear/wheel[2]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -126,7 +126,7 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step>0.001</step>
   </binding>
  </button>
@@ -135,7 +135,7 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step>-0.001</step>
   </binding>
  </button>
@@ -144,8 +144,8 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/mixture[0]</property>
-   <property>/controls/mixture[1]</property>
+   <property>/controls/engines/engine[0]/mixture</property>
+   <property>/controls/engines/engine[1]/mixture</property>
    <step>0.01</step>
   </binding>
  </button>
@@ -154,8 +154,8 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/mixture[0]</property>
-   <property>/controls/mixture[1]</property>
+   <property>/controls/engines/engine[0]/mixture</property>
+   <property>/controls/engines/engine[1]/mixture</property>
    <step>-0.01</step>
   </binding>
  </button>
@@ -163,13 +163,13 @@
  <button n="5">
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -178,13 +178,13 @@
  <button n="6">
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
diff --git a/Input/Joysticks/Logitech/wingman-force.xml b/Input/Joysticks/Logitech/wingman-force.xml
index 1055f13b0..f3a661d7e 100644
--- a/Input/Joysticks/Logitech/wingman-force.xml
+++ b/Input/Joysticks/Logitech/wingman-force.xml
@@ -30,7 +30,7 @@
   <desc>Aileron</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <squared>true</squared>
   </binding>
  </axis>
@@ -39,7 +39,7 @@
   <desc>Elevator</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <factor type="double">-1.0</factor>
    <squared>true</squared>
   </binding>
@@ -49,13 +49,13 @@
   <desc>Throttle</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
+   <property>/controls/engines/engine[0]/throttle</property>
    <offset type="double">+1.0</offset>
    <factor type="double">+0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
+   <property>/controls/engines/engine[1]/throttle</property>
    <offset type="double">+1.0</offset>
    <factor type="double">+0.5</factor>
   </binding>
@@ -81,33 +81,33 @@
   <desc>Brakes</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[2]</property>
+   <property>/controls/gear/wheel[2]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[2]</property>
+    <property>/controls/gear/wheel[2]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -117,7 +117,7 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step>0.001</step>
   </binding>
  </button>
@@ -126,7 +126,7 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step>-0.001</step>
   </binding>
  </button>
@@ -135,8 +135,8 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/mixture[0]</property>
-   <property>/controls/mixture[1]</property>
+   <property>/controls/engines/engine[0]/mixture</property>
+   <property>/controls/engines/engine[1]/mixture</property>
    <step>0.01</step>
   </binding>
  </button>
@@ -145,8 +145,8 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/mixture[0]</property>
-   <property>/controls/mixture[1]</property>
+   <property>/controls/engines/engine[0]/mixture</property>
+   <property>/controls/engines/engine[1]/mixture</property>
    <step>-0.01</step>
   </binding>
  </button>
@@ -154,13 +154,13 @@
  <button n="6">
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -169,13 +169,13 @@
  <button n="7">
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
diff --git a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
index 6b1264c81..c041d8ac1 100644
--- a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
+++ b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
@@ -34,7 +34,7 @@
   <desc>Aileron</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <squared>true</squared>
   </binding>
  </axis>
@@ -43,7 +43,7 @@
   <desc>Elevator</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <factor type="double">-1.0</factor>
    <squared>true</squared>
   </binding>
@@ -53,13 +53,13 @@
   <desc>Throttle</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
+   <property>/controls/engines/engine[0]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
+   <property>/controls/engines/engine[1]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -68,7 +68,7 @@
  <axis n="3">
   <binding>
    <command>property-scale</command>
-   <property>/controls/rudder</property>
+   <property>/controls/flight/rudder</property>
    <factor>1.0</factor>
    <offset>0.0</offset>
    <squared>true</squared>
@@ -83,7 +83,7 @@
    <repeatable>true</repeatable>
    <binding>
     <command>property-adjust</command>
-    <property>/controls/elevator-trim</property>
+    <property>/controls/flight/elevator-trim</property>
     <step>0.005</step>
    </binding>
   </low>
@@ -91,7 +91,7 @@
    <repeatable>true</repeatable>
    <binding>
     <command>property-adjust</command>
-    <property>/controls/elevator-trim</property>
+    <property>/controls/flight/elevator-trim</property>
     <step>-0.005</step>
    </binding>
   </high>
@@ -145,7 +145,7 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step>-0.001</step>
   </binding>
   <binding>
@@ -160,12 +160,12 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/propeller-pitch[0]</property>
+   <property>/controls/engines/engine[0]/propeller-pitch</property>
    <step>-0.01</step>
   </binding>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/propeller-pitch[1]</property>
+   <property>/controls/engines/engine[1]/propeller-pitch</property>
    <step>-0.01</step>
   </binding>
  </button>
@@ -174,12 +174,12 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/mixture[0]</property>
+   <property>/controls/engines/engine[0]/mixture</property>
    <step>-0.01</step>
   </binding>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/mixture[1]</property>
+   <property>/controls/engines/engine[1]/mixture</property>
    <step>-0.01</step>
   </binding>
  </button>
@@ -188,7 +188,7 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step>0.001</step>
   </binding>
  </button>
@@ -197,12 +197,12 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/propeller-pitch[0]</property>
+   <property>/controls/engines/engine[0]/propeller-pitch</property>
    <step>0.01</step>
   </binding>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/propeller-pitch[1]</property>
+   <property>/controls/engines/engine[1]/propeller-pitch</property>
    <step>0.01</step>
   </binding>
  </button>
@@ -211,12 +211,12 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/mixture[0]</property>
+   <property>/controls/engines/engine[0]/mixture</property>
    <step>0.01</step>
   </binding>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/mixture[1]</property>
+   <property>/controls/engines/engine[1]/mixture</property>
    <step>0.01</step>
   </binding>
  </button>
@@ -225,13 +225,13 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <step>0.1</step>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value>0.0</value>
    </binding>
   </mod-up>
@@ -241,13 +241,13 @@
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <step>0.1</step>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value>0.0</value>
    </binding>
   </mod-up>
diff --git a/Input/Joysticks/Microsoft/sidewinder-force-feed.xml b/Input/Joysticks/Microsoft/sidewinder-force-feed.xml
index 11c7fad5b..7522414e2 100644
--- a/Input/Joysticks/Microsoft/sidewinder-force-feed.xml
+++ b/Input/Joysticks/Microsoft/sidewinder-force-feed.xml
@@ -29,7 +29,7 @@
   <desc>Aileron</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <squared type="bool">true</squared>
   </binding>
  </axis>
@@ -38,7 +38,7 @@
   <desc>Elevator</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <factor type="double">-1.0</factor>
    <squared type="bool">true</squared>
   </binding>
@@ -48,13 +48,13 @@
   <desc>Throttle</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
+   <property>/controls/engines/engine[0]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
+   <property>/controls/engines/engine[1]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -64,7 +64,7 @@
   <desc>Rudder</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/rudder</property>
+   <property>/controls/flight/rudder</property>
    <factor type="double">1.0</factor>
   </binding>
  </axis>
@@ -113,33 +113,33 @@
   <desc>Brakes</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[2]</property>
+   <property>/controls/gear/wheel[2]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[2]</property>
+    <property>/controls/gear/wheel[2]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -150,7 +150,7 @@
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">0.001</step>
   </binding>
  </button>
@@ -160,7 +160,7 @@
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">-0.001</step>
   </binding>
  </button>
@@ -170,7 +170,7 @@
   <repeatable>false</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">-0.34</step>
   </binding>
  </button>
@@ -180,7 +180,7 @@
   <repeatable>false</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">0.34</step>
   </binding>
  </button>
@@ -189,13 +189,13 @@
   <desc>Right brake</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -205,13 +205,13 @@
   <desc>Left brake</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
diff --git a/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml b/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
index b318861e4..b0a1c2dd3 100644
--- a/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
+++ b/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
@@ -29,7 +29,7 @@
   <desc>Aileron</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <squared type="bool">true</squared>
   </binding>
  </axis>
@@ -38,7 +38,7 @@
   <desc>Elevator</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <factor type="double">-1.0</factor>
    <squared type="bool">true</squared>
   </binding>
@@ -48,7 +48,7 @@
   <desc>Rudder</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/rudder</property>
+   <property>/controls/flight/rudder</property>
    <factor type="double">1.0</factor>
   </binding>
  </axis>
@@ -57,13 +57,13 @@
   <desc>Throttle</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
+   <property>/controls/engines/engine[0]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
+   <property>/controls/engines/engine[1]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -113,33 +113,33 @@
   <desc>Brakes</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[2]</property>
+   <property>/controls/gear/wheel[2]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[2]</property>
+    <property>/controls/gear/wheel[2]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -150,7 +150,7 @@
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">0.001</step>
   </binding>
  </button>
@@ -160,7 +160,7 @@
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">-0.001</step>
   </binding>
  </button>
@@ -170,7 +170,7 @@
   <repeatable>false</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">-0.34</step>
   </binding>
  </button>
@@ -180,7 +180,7 @@
   <repeatable>false</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">0.34</step>
   </binding>
  </button>
@@ -189,13 +189,13 @@
   <desc>Right brake</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -205,13 +205,13 @@
   <desc>Left brake</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
diff --git a/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml b/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
index 3de904210..39b4f0b6c 100644
--- a/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
+++ b/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
@@ -40,7 +40,7 @@ three-axis, three-button joystick, as follow:
 <desc>Aileron</desc>
 <binding>
 <command>property-scale</command>
-<property>/controls/aileron</property>
+<property>/controls/flight/aileron</property>
 <squared type="bool">true</squared>
 </binding>
 </axis>
@@ -49,7 +49,7 @@ three-axis, three-button joystick, as follow:
 <desc>Elevator</desc>
 <binding>
 <command>property-scale</command>
-<property>/controls/elevator</property>
+<property>/controls/flight/elevator</property>
 <factor type="double">-1.0</factor>
 <squared type="bool">true</squared>
 </binding>
@@ -59,7 +59,7 @@ three-axis, three-button joystick, as follow:
 <desc>Rudder</desc>
 <binding>
 <command>property-scale</command>
-<property>/controls/rudder</property>
+<property>/controls/flight/rudder</property>
 <offset type="double">0.0</offset>
 <factor type="double">1.0</factor>
 </binding>
@@ -69,13 +69,13 @@ three-axis, three-button joystick, as follow:
 <desc>Throttle</desc>
 <binding>
 <command>property-scale</command>
-<property>/controls/throttle[0]</property>
+<property>/controls/engines/engine[0]/throttle</property>
 <offset type="double">-1.0</offset>
 <factor type="double">-0.5</factor>
 </binding>
 <binding>
 <command>property-scale</command>
-<property>/controls/throttle[1]</property>
+<property>/controls/engines/engine[1]/throttle</property>
 <offset type="double">-1.0</offset>
 <factor type="double">-0.5</factor>
 </binding>
@@ -103,33 +103,33 @@ three-axis, three-button joystick, as follow:
 <desc>Brakes</desc>
 <binding>
 <command>property-assign</command>
-<property>/controls/brakes[0]</property>
+<property>/controls/gear/wheel[0]/brake</property>
 <value type="double">1.0</value>
 </binding>
 <binding>
 <command>property-assign</command>
-<property>/controls/brakes[1]</property>
+<property>/controls/gear/wheel[1]/brake</property>
 <value type="double">1.0</value>
 </binding>
 <binding>
 <command>property-assign</command>
-<property>/controls/brakes[2]</property>
+<property>/controls/gear/wheel[2]/brake</property>
 <value type="double">1.0</value>
 </binding>
 <mod-up>
 <binding>
 <command>property-assign</command>
-<property>/controls/brakes[0]</property>
+<property>/controls/gear/wheel[0]/brake</property>
 <value type="double">0.0</value>
 </binding>
 <binding>
 <command>property-assign</command>
-<property>/controls/brakes[1]</property>
+<property>/controls/gear/wheel[1]/brake</property>
 <value type="double">0.0</value>
 </binding>
 <binding>
 <command>property-assign</command>
-<property>/controls/brakes[2]</property>
+<property>/controls/gear/wheel[2]/brake</property>
 <value type="double">0.0</value>
 </binding>
 </mod-up>
@@ -140,12 +140,12 @@ three-axis, three-button joystick, as follow:
 <repeatable type="bool">true</repeatable>
 <binding>
 <command>property-adjust</command>
-<property>/controls/propeller-pitch[0]</property>
+<property>/controls/engines/engine[0]/propeller-pitch</property>
 <step type="double">-0.01</step>
 </binding>
 <binding>
 <command>property-adjust</command>
-<property>/controls/propeller-pitch[1]</property>
+<property>/controls/engines/engine[1]/propeller-pitch</property>
 <step type="double">-0.01</step>
 </binding>
 </button>
@@ -165,12 +165,12 @@ three-axis, three-button joystick, as follow:
 <repeatable type="bool">true</repeatable>
 <binding>
 <command>property-adjust</command>
-<property>/controls/propeller-pitch[0]</property>
+<property>/controls/engines/engine[0]/propeller-pitch</property>
 <step type="double">+0.01</step>
 </binding>
 <binding>
 <command>property-adjust</command>
-<property>/controls/propeller-pitch[1]</property>
+<property>/controls/engines/engine[1]/propeller-pitch</property>
 <step type="double">+0.01</step>
 </binding>
 </button>
@@ -180,7 +180,7 @@ three-axis, three-button joystick, as follow:
 <repeatable type="bool">true</repeatable>
 <binding>
 <command>property-adjust</command>
-<property>/controls/elevator-trim</property>
+<property>/controls/flight/elevator-trim</property>
 <step type="double">0.001</step>
 </binding>
 </button>
@@ -190,7 +190,7 @@ three-axis, three-button joystick, as follow:
 <repeatable type="bool">false</repeatable>
 <binding>
 <command>property-adjust</command>
-<property>/controls/flaps</property>
+<property>/controls/flight/flaps</property>
 <step type="double">-0.34</step>
 </binding>
 </button>
@@ -200,7 +200,7 @@ three-axis, three-button joystick, as follow:
 <repeatable type="bool">true</repeatable>
 <binding>
 <command>property-adjust</command>
-<property>/controls/elevator-trim</property>
+<property>/controls/flight/elevator-trim</property>
 <step type="double">-0.001</step>
 </binding>
 </button>
@@ -210,7 +210,7 @@ three-axis, three-button joystick, as follow:
 <repeatable type="bool">false</repeatable>
 <binding>
 <command>property-adjust</command>
-<property>/controls/flaps</property>
+<property>/controls/flight/flaps</property>
 <step type="double">+0.34</step>
 </binding>
 </button>
@@ -220,12 +220,12 @@ three-axis, three-button joystick, as follow:
 <repeatable type="bool">true</repeatable>
 <binding>
 <command>property-adjust</command>
-<property>/controls/mixture[0]</property>
+<property>/controls/engines/engine[0]/mixture</property>
 <step type="double">+0.01</step>
 </binding>
 <binding>
 <command>property-adjust</command>
-<property>/controls/mixture[1]</property>
+<property>/controls/engines/engine[1]/mixture</property>
 <step type="double">+0.01</step>
 </binding>
 </button>
@@ -235,12 +235,12 @@ three-axis, three-button joystick, as follow:
 <repeatable type="bool">true</repeatable>
 <binding>
 <command>property-adjust</command>
-<property>/controls/mixture[0]</property>
+<property>/controls/engines/engine[0]/mixture</property>
 <step type="double">-0.01</step>
 </binding>
 <binding>
 <command>property-adjust</command>
-<property>/controls/mixture[1]</property>
+<property>/controls/engines/engine[1]/mixture</property>
 <step type="double">-0.01</step>
 </binding>
 </button>
diff --git a/Input/Joysticks/Saitek/X45.xml b/Input/Joysticks/Saitek/X45.xml
index 4a5363f58..f17c7c89e 100644
--- a/Input/Joysticks/Saitek/X45.xml
+++ b/Input/Joysticks/Saitek/X45.xml
@@ -55,7 +55,7 @@ Button Numbers:
   <desc>Aileron</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <squared type="bool">true</squared>
   </binding>
  </axis>
@@ -64,7 +64,7 @@ Button Numbers:
   <desc>Elevator</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <factor type="double">-1.0</factor>
    <squared type="bool">true</squared>
   </binding>
@@ -74,14 +74,14 @@ Button Numbers:
   <desc>Rudder</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/rudder</property>
+   <property>/controls/flight/rudder</property>
   </binding>
   <binding>
     <condition>
      <property>/input/joysticks/js[0]/locks/m3</property>
     </condition>
     <command>property-scale</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <factor type="double">-1.0</factor>
     <min type="double">0.0</min>
     <max type="double">1.0</max>
@@ -91,7 +91,7 @@ Button Numbers:
      <property>/input/joysticks/js[0]/locks/m3</property>
     </condition>
     <command>property-scale</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <min type="double">0.0</min>
     <max type="double">1.0</max>
   </binding>
@@ -101,13 +101,13 @@ Button Numbers:
   <desc>Throttle</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
+   <property>/controls/engines/engine[0]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
+   <property>/controls/engines/engine[1]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -117,13 +117,13 @@ Button Numbers:
   <desc>Mixture</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/mixture[0]</property>
+   <property>/controls/engines/engine[0]/mixture</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/mixture[1]</property>
+   <property>/controls/engines/engine[1]/mixture</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -133,11 +133,11 @@ Button Numbers:
   <desc>Propeller Advance</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/propeller-pitch[0]</property>
+   <property>/controls/engines/engine[0]/propeller-pitch</property>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/propeller-pitch[1]</property>
+   <property>/controls/engines/engine[1]/propeller-pitch</property>
   </binding>
  </axis>
 
@@ -213,33 +213,33 @@ Button Numbers:
   <desc>Brakes</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[2]</property>
+   <property>/controls/gear/wheel[2]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[2]</property>
+    <property>/controls/gear/wheel[2]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -251,7 +251,7 @@ Button Numbers:
   <desc>Landing Gear Up/Down Toggle</desc>
   <binding>
    <command>property-toggle</command>
-   <property>/controls/gear-down</property>
+   <property>/controls/gear/gear-down</property>
   </binding>
  </button>
 
@@ -330,7 +330,7 @@ Mode 3 - Taxi Mode
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">-0.001</step>
   </binding>
  </button>
@@ -339,7 +339,7 @@ Mode 3 - Taxi Mode
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">0.001</step>
   </binding>
  </button>
@@ -351,7 +351,7 @@ Mode 3 - Taxi Mode
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">0.0015</step>
   </binding>
  </button>
@@ -361,7 +361,7 @@ Mode 3 - Taxi Mode
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/aileron-trim</property>
+   <property>/controls/flight/aileron-trim</property>
    <step type="double">0.0015</step>
   </binding>
  </button>
@@ -371,7 +371,7 @@ Mode 3 - Taxi Mode
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">-0.0015</step>
   </binding>
  </button>
@@ -381,7 +381,7 @@ Mode 3 - Taxi Mode
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/aileron-trim</property>
+   <property>/controls/flight/aileron-trim</property>
    <step type="double">-0.0015</step>
   </binding>
  </button>
@@ -392,7 +392,7 @@ Mode 3 - Taxi Mode
   <desc>Decrease flaps</desc>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">-0.34</step>
   </binding>
  </button>
@@ -401,7 +401,7 @@ Mode 3 - Taxi Mode
   <desc>Increase flaps</desc>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">0.34</step>
   </binding>
  </button>
@@ -413,7 +413,7 @@ Mode 3 - Taxi Mode
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/rudder-trim</property>
+   <property>/controls/flight/rudder-trim</property>
    <step type="double">0.0015</step>
   </binding>
  </button>
@@ -423,7 +423,7 @@ Mode 3 - Taxi Mode
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/rudder-trim</property>
+   <property>/controls/flight/rudder-trim</property>
    <step type="double">-0.0015</step>
   </binding>
  </button>
diff --git a/Input/Joysticks/Saitek/X8-30.xml b/Input/Joysticks/Saitek/X8-30.xml
index 67a027a53..b3ac32ffe 100644
--- a/Input/Joysticks/Saitek/X8-30.xml
+++ b/Input/Joysticks/Saitek/X8-30.xml
@@ -30,7 +30,7 @@ Layout:
   <desc>Aileron</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <squared type="bool">true</squared>
   </binding>
  </axis>
@@ -39,7 +39,7 @@ Layout:
   <desc>Elevator</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <factor type="double">-1.0</factor>
    <squared type="bool">true</squared>
   </binding>
@@ -49,13 +49,13 @@ Layout:
   <desc>Throttle</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
+   <property>/controls/engines/engine[0]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
+   <property>/controls/engines/engine[1]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -68,7 +68,7 @@ Layout:
    <repeatable type="bool">true</repeatable>
    <binding>
     <command>property-adjust</command>
-    <property>/controls/rudder</property>
+    <property>/controls/flight/rudder</property>
     <step type="double">-0.05</step>
    </binding>
   </low>
@@ -76,7 +76,7 @@ Layout:
    <repeatable type="bool">true</repeatable>
    <binding>
     <command>property-adjust</command>
-    <property>/controls/rudder</property>
+    <property>/controls/flight/rudder</property>
     <step type="double">0.05</step>
    </binding>
   </high>
@@ -89,7 +89,7 @@ Layout:
    <repeatable type="bool">true</repeatable>
    <binding>
     <command>property-adjust</command>
-    <property>/controls/elevator-trim</property>
+    <property>/controls/flight/elevator-trim</property>
     <step type="double">0.001</step>
    </binding>
   </low>
@@ -97,7 +97,7 @@ Layout:
    <repeatable type="bool">true</repeatable>
    <binding>
     <command>property-adjust</command>
-    <property>/controls/elevator-trim</property>
+    <property>/controls/flight/elevator-trim</property>
     <step type="double">-0.001</step>
    </binding>
   </high>
@@ -107,33 +107,33 @@ Layout:
   <desc>Brakes</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[2]</property>
+   <property>/controls/gear/wheel[2]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[2]</property>
+    <property>/controls/gear/wheel[2]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -144,7 +144,7 @@ Layout:
   <binding>
    <desc>Center rudder</desc>
    <command>property-assign</command>
-   <property>/controls/rudder</property>
+   <property>/controls/flight/rudder</property>
    <value type="double">0.0</value>
   </binding>
  </button>
@@ -154,7 +154,7 @@ Layout:
   <binding>
    <desc>Flaps up</desc>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">-0.34</step>
   </binding>
  </button>
@@ -164,7 +164,7 @@ Layout:
   <binding>
    <desc>Flaps down</desc>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">0.34</step>
   </binding>
  </button>
diff --git a/keyboard.xml b/keyboard.xml
index e9876b25d..65d5b79a2 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -140,7 +140,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/input/selected/engine[0]</property>
    </condition>
    <command>property-assign</command>
-   <property>/controls/starter[0]</property>
+   <property>/controls/engines/engine[0]/starter</property>
    <value type="bool">true</value>
   </binding>
 
@@ -149,7 +149,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/input/selected/engine[1]</property>
    </condition>
    <command>property-assign</command>
-   <property>/controls/starter[1]</property>
+   <property>/controls/engines/engine[1]/starter</property>
    <value type="bool">true</value>
   </binding>
 
@@ -158,7 +158,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/input/selected/engine[2]</property>
    </condition>
    <command>property-assign</command>
-   <property>/controls/starter[2]</property>
+   <property>/controls/engines/engine[2]/starter</property>
    <value type="bool">true</value>
   </binding>
 
@@ -167,29 +167,29 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/input/selected/engine[3]</property>
    </condition>
    <command>property-assign</command>
-   <property>/controls/starter[3]</property>
+   <property>/controls/engines/engine[3]/starter</property>
    <value type="bool">true</value>
   </binding>
 
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/starter[0]</property>
+    <property>/controls/engines/engine[0]/starter</property>
     <value type="bool">false</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/starter[1]</property>
+    <property>/controls/engines/engine[1]/starter</property>
     <value type="bool">false</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/starter[2]</property>
+    <property>/controls/engines/engine[2]/starter</property>
     <value type="bool">false</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/starter[3]</property>
+    <property>/controls/engines/engine[3]/starter</property>
     <value type="bool">false</value>
    </binding>
   </mod-up>
@@ -294,13 +294,13 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Left brake</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -321,13 +321,13 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Right brake</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -348,7 +348,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Decrease elevator trim.</desc>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">-0.001</step>
   </binding>
   <mod-shift>
@@ -417,7 +417,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Move aileron left.</desc>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <step type="double">-0.05</step>
   </binding>
   <mod-shift>
@@ -440,17 +440,17 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Center aileron, elevator, and rudder.</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <value type="double">0.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <value type="double">0.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/rudder</property>
+   <property>/controls/flight/rudder</property>
    <value type="double">0.0</value>
   </binding>
  </key>
@@ -460,7 +460,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Move aileron right.</desc>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <step type="double">0.05</step>
   </binding>
   <mod-shift>
@@ -483,7 +483,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Increase elevator trim.</desc>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">0.001</step>
   </binding>
   <mod-shift>
@@ -598,7 +598,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Toggle parking brake on or off</desc>
   <binding>
    <command>property-toggle</command>
-   <property>/controls/parking-brake</property>
+   <property>/controls/gear/parking-brake</property>
   </binding>
  </key>
 
@@ -694,7 +694,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Decrease flaps.</desc>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">-0.34</step>
   </binding>
  </key>
@@ -704,7 +704,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Increase flaps.</desc>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/flaps</property>
+   <property>/controls/flight/flaps</property>
    <step type="double">0.34</step>
   </binding>
  </key>
@@ -725,34 +725,34 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Apply all brakes.</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[2]</property>
+   <property>/controls/gear/wheel[2]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <desc>Release all brakes.</desc>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[2]</property>
+    <property>/controls/gear/wheel[2]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -798,7 +798,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Toggle gear down.</desc>
   <binding>
    <command>property-toggle</command>
-   <property>/controls/gear-down</property>
+   <property>/controls/gear/gear-down</property>
   </binding>
  </key>
 
@@ -807,7 +807,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Toggle tail-wheel lock.</desc>
   <binding>
    <command>property-toggle</command>
-   <property>/controls/tailwheel-castering</property>
+   <property>/controls/gear/tailwheel-lock</property>
   </binding>
  </key>
 
@@ -911,7 +911,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/input/selected/engine[0]</property>
    </condition>
    <command>property-adjust</command>
-   <property>/controls/magnetos[0]</property>
+   <property>/controls/engines/engine[0]/magnetos</property>
    <step type="int">-1</step>
   </binding>
   <binding>
@@ -920,7 +920,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/input/selected/engine[1]</property>
    </condition>
    <command>property-adjust</command>
-   <property>/controls/magnetos[1]</property>
+   <property>/controls/engines/engine[1]/magnetos</property>
    <step type="int">-1</step>
   </binding>
   <binding>
@@ -929,7 +929,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/input/selected/engine[2]</property>
    </condition>
    <command>property-adjust</command>
-   <property>/controls/magnetos[2]</property>
+   <property>/controls/engines/engine[2]/magnetos</property>
    <step type="int">-1</step>
   </binding>
   <binding>
@@ -938,7 +938,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/input/selected/engine[3]</property>
    </condition>
    <command>property-adjust</command>
-   <property>/controls/magnetos[3]</property>
+   <property>/controls/engines/engine[3]/magnetos</property>
    <step type="int">-1</step>
   </binding>
  </key>
@@ -952,7 +952,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/input/selected/engine[0]</property>
    </condition>
    <command>property-adjust</command>
-   <property>/controls/magnetos[0]</property>
+   <property>/controls/engines/engine[0]/magnetos</property>
    <step type="int">1</step>
   </binding>
   <binding>
@@ -961,7 +961,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
     <property>/sim/input/selected/engine[1]</property>
    </condition>
    <command>property-adjust</command>
-   <property>/controls/magnetos[1]</property>
+   <property>/controls/engines/engine[1]/magnetos</property>
    <step type="int">1</step>
   </binding>
  </key>
@@ -1149,17 +1149,17 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Center aileron, elevator, and rudder.</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <value type="double">0.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <value type="double">0.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/rudder</property>
+   <property>/controls/flight/rudder</property>
    <value type="double">0.0</value>
   </binding>
  </key>
@@ -1169,7 +1169,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Move aileron left.</desc>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <step type="double">-0.05</step>
   </binding>
   <mod-shift>
@@ -1215,7 +1215,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Move aileron right.</desc>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/aileron</property>
+   <property>/controls/flight/aileron</property>
    <step type="double">0.05</step>
   </binding>
   <mod-shift>
@@ -1307,7 +1307,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Increase elevator trim.</desc>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">0.001</step>
   </binding>
   <mod-shift>
@@ -1330,7 +1330,7 @@ calculated by adding 256 to the GLUT key value in glut.h.
   <desc>Decrease elevator trim.</desc>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">-0.001</step>
   </binding>
   <mod-shift>
diff --git a/mice.xml b/mice.xml
index 9c0ae8ab1..961bb5122 100644
--- a/mice.xml
+++ b/mice.xml
@@ -43,7 +43,7 @@ The current mode for each mouse is held in the
    <button n="3">
     <binding>
      <command>property-adjust</command>
-     <property>/controls/elevator-trim</property>
+     <property>/controls/flight/elevator-trim</property>
      <step type="double">0.002</step>
     </binding>
    </button>
@@ -51,7 +51,7 @@ The current mode for each mouse is held in the
    <button n="4">
     <binding>
      <command>property-adjust</command>
-     <property>/controls/elevator-trim</property>
+     <property>/controls/flight/elevator-trim</property>
      <step type="double">-0.002</step>
     </binding>
    </button>
@@ -76,7 +76,7 @@ The current mode for each mouse is held in the
    <button n="3">
     <binding>
      <command>property-adjust</command>
-     <property>/controls/elevator-trim</property>
+     <property>/controls/flight/elevator-trim</property>
      <step type="double">0.01</step>
     </binding>
    </button>
@@ -84,7 +84,7 @@ The current mode for each mouse is held in the
    <button n="4">
     <binding>
      <command>property-adjust</command>
-     <property>/controls/elevator-trim</property>
+     <property>/controls/flight/elevator-trim</property>
      <step type="double">-0.01</step>
     </binding>
    </button>
@@ -105,7 +105,7 @@ The current mode for each mouse is held in the
       </and>
      </condition>
      <command>property-adjust</command>
-     <property>/controls/aileron</property>
+     <property>/controls/flight/aileron</property>
      <factor type="double">4.0</factor>
      <min type="double">-1.0</min>
      <max type="double">1.0</max>
@@ -123,7 +123,7 @@ The current mode for each mouse is held in the
       </and>
      </condition>
      <command>property-adjust</command>
-     <property>/controls/rudder</property>
+     <property>/controls/flight/rudder</property>
      <factor type="double">4.0</factor>
      <min type="double">-1.0</min>
      <max type="double">1.0</max>
@@ -148,7 +148,7 @@ The current mode for each mouse is held in the
       </and>
      </condition>
      <command>property-adjust</command>
-     <property>/controls/elevator</property>
+     <property>/controls/flight/elevator</property>
      <factor type="double">-4.0</factor>
      <min type="double">-1.0</min>
      <max type="double">1.0</max>
@@ -166,7 +166,7 @@ The current mode for each mouse is held in the
       </and>
      </condition>
      <command>property-adjust</command>
-     <property>/controls/throttle</property>
+     <property>/controls/engines/engine/throttle</property>
      <factor type="double">-4.0</factor>
      <min type="double">0.0</min>
      <max type="double">1.0</max>
@@ -210,7 +210,7 @@ The current mode for each mouse is held in the
    <button n="3">
     <binding>
      <command>property-adjust</command>
-     <property>/controls/elevator-trim</property>
+     <property>/controls/flight/elevator-trim</property>
      <step type="double">0.01</step>
     </binding>
    </button>
@@ -218,7 +218,7 @@ The current mode for each mouse is held in the
    <button n="4">
     <binding>
      <command>property-adjust</command>
-     <property>/controls/elevator-trim</property>
+     <property>/controls/flight/elevator-trim</property>
      <step type="double">-0.01</step>
     </binding>
    </button>
diff --git a/preferences.xml b/preferences.xml
index 37972153d..67a7eef84 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -32,7 +32,6 @@ Started September 2000 by David Megginson, david@megginson.com
   </startup>
   <rendering>
    <random-objects>true</random-objects>
-   <draw-otw>true</draw-otw>
   </rendering>
   <model-hz type="int">120</model-hz>
   <sound>
@@ -279,62 +278,84 @@ Started September 2000 by David Megginson, david@megginson.com
   </params>
  </environment>
 
-
- <!-- Controls -->
-
  <controls>
+  <flight>
+   <aileron type="double">0.0</aileron>
+   <aileron-trim type="double">0.0</aileron-trim>
+   <elevator type="double">0.0</elevator>
+   <elevator-trim type="double">0.0</elevator-trim>
+   <rudder type="double">0.0</rudder>
+   <rudder-trim type="double">0.0</rudder-trim>
+   <flaps type="double">0.0</flaps>
+  </flight>
+ 
+  <engines>
+   <engine n="0">
+    <starter type="bool">false</starter>
+    <magnetos type="int">0</magnetos>
+    <throttle type="double">0.0</throttle>
+    <mixture type="double">1.0</mixture>
+    <propeller-pitch type="double">1.0</propeller-pitch>
+   </engine>
+   <engine n="1">
+    <starter type="bool">false</starter>
+    <magnetos type="int">0</magnetos>
+    <throttle type="double">0.0</throttle>
+    <mixture type="double">1.0</mixture>
+    <propeller-pitch type="double">1.0</propeller-pitch>
+   </engine>
+   <engine n="2">
+    <starter type="bool">false</starter>
+    <magnetos type="int">0</magnetos>
+    <throttle type="double">0.0</throttle>
+    <mixture type="double">1.0</mixture>
+    <propeller-pitch type="double">1.0</propeller-pitch>
+   </engine>
+   <engine n="3">
+    <starter type="bool">false</starter>
+    <magnetos type="int">0</magnetos>
+    <throttle type="double">0.0</throttle>
+    <mixture type="double">1.0</mixture>
+    <propeller-pitch type="double">1.0</propeller-pitch>
+   </engine>
+  </engines>
 
-  <aileron type="double">0.0</aileron>
-  <aileron-trim type="double">0.0</aileron-trim>
+  <gear>
+   <wheel n="0">
+    <brake type="double">0.0</brake>
+   </wheel>
+   <wheel n="1">
+    <brake type="double">0.0</brake>
+   </wheel>
+   <wheel n="2">
+    <brake type="double">0.0</brake>
+   </wheel>
+   <gear-down type="bool">true</gear-down>
+  </gear>
 
-  <elevator type="double">0.0</elevator>
-  <elevator-trim type="double">0.0</elevator-trim>
-
-  <rudder type="double">0.0</rudder>
-  <rudder-trim type="double">0.0</rudder-trim>
-
-  <flaps type="double">0.0</flaps>
-
-  <starter n="0" type="bool">false</starter>
-  <magnetos n="0" type="int">0</magnetos>
-  <throttle n="0" type="double">0.0</throttle>
-  <mixture n="0" type="double">1.0</mixture>
-  <propeller-pitch n="0" type="double">1.0</propeller-pitch>
-  <carb-heat n="0" type="double">0.0</carb-heat>
-
-  <starter n="1" type="bool">false</starter>
-  <magnetos n="1" type="int">0</magnetos>
-  <throttle n="1" type="double">0.0</throttle>
-  <mixture n="1" type="double">1.0</mixture>
-  <propeller-pitch n="1" type="double">1.0</propeller-pitch>
-
-  <starter n="2" type="bool">false</starter>
-  <magnetos n="2" type="int">0</magnetos>
-  <throttle n="2" type="double">0.0</throttle>
-  <mixture n="2" type="double">1.0</mixture>
-  <propeller-pitch n="2" type="double">1.0</propeller-pitch>
-
-  <starter n="3" type="bool">false</starter>
-  <magnetos n="3" type="int">0</magnetos>
-  <throttle n="3" type="double">0.0</throttle>
-  <mixture n="3" type="double">1.0</mixture>
-  <propeller-pitch n="3" type="double">1.0</propeller-pitch>
-
-  <brakes n="0" type="double">0.0</brakes>
-  <brakes n="1" type="double">0.0</brakes>
-  <brakes n="2" type="double">0.0</brakes>
-
-  <gear-down type="double">1.0</gear-down>
-
-  <lights>
-   <taxi type="bool">false</taxi>
-   <landing type="bool">false</landing>
-   <navigation type="bool">false</navigation>
+  <lighting>
+   <taxi-light type="bool">true</taxi-light>
+   <landing-lights type="bool">true</landing-lights>
+   <nav-lights type="bool">true</nav-lights>
    <beacon type="bool">true</beacon>
-   <strobes type="bool">false</strobes>
-  </lights>
-
-  <pitot-heat type="bool">false</pitot-heat>
+   <strobe type="bool">false</strobe>
+  </lighting>
+ 
+  <anti-ice>
+   <pitot-heat type="bool">false</pitot-heat>
+   <engine n="0">
+    <carb-heat type="bool">false</carb-heat>
+   </engine>
+   <engine n="1">
+    <carb-heat type="bool">false</carb-heat>
+   </engine>
+   <engine n="2">
+    <carb-heat type="bool">false</carb-heat>
+   </engine>
+   <engine n="3">
+    <carb-heat type="bool">false</carb-heat>
+   </engine>
+  </anti-ice>
 
  </controls>
 
@@ -434,7 +455,7 @@ Started September 2000 by David Megginson, david@megginson.com
   <heading-indicator>
    <serviceable type="bool" archive="y">true</serviceable>
    <spin type="double" archive="y">0.0</spin>
-   <offset-deg type="double" archive="y">4.5</offset-deg> <!-- just for fun -->
+   <offset-deg type="double" archive="y">4.5</offset-deg>  <!-- just for fun -->
   </heading-indicator>
   <vertical-speed-indicator>
    <serviceable type="bool" archive="y">true</serviceable>