diff --git a/Input/Joysticks/Default/four-axis-joystick.xml b/Input/Joysticks/Default/four-axis-joystick.xml
index 86f76e930..0c49c54bd 100644
--- a/Input/Joysticks/Default/four-axis-joystick.xml
+++ b/Input/Joysticks/Default/four-axis-joystick.xml
@@ -35,52 +35,8 @@ joystick, and that the first button is the trigger.
  <axis n="2">
   <desc>Throttle</desc>
   <binding>
-   <command>property-scale</command>
-   <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/engines/engine[1]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[2]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[3]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[4]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[5]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[6]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[7]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
+   <command>nasal</command>
+   <script>controls.throttleAxis()</script>
   </binding>
  </axis>
 
@@ -95,35 +51,13 @@ joystick, and that the first button is the trigger.
  <button n="0">
   <desc>Brakes</desc>
   <binding>
-   <command>property-assign</command>
-   <property>/controls/gear/wheel[0]/brake</property>
-   <value type="double">1.0</value>
-  </binding>
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/gear/wheel[1]/brake</property>
-   <value type="double">1.0</value>
-  </binding>
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/gear/wheel[2]/brake</property>
-   <value type="double">1.0</value>
+   <command>nasal</command>
+   <script>props.setAll("/controls/gear/wheel", "brake", 1)</script>
   </binding>
   <mod-up>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/gear/wheel[0]/brake</property>
-    <value type="double">0.0</value>
-   </binding>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/gear/wheel[1]/brake</property>
-    <value type="double">0.0</value>
-   </binding>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/gear/wheel[2]/brake</property>
-    <value type="double">0.0</value>
+  <binding>
+    <command>nasal</command>
+    <script>props.setAll("/controls/gear/wheel", "brake", 0)</script>
    </binding>
   </mod-up>
  </button>
@@ -132,9 +66,8 @@ joystick, and that the first button is the trigger.
   <desc>Elevator trim up</desc>
   <repeatable type="bool">true</repeatable>
   <binding>
-   <command>property-adjust</command>
-   <property>/controls/flight/elevator-trim</property>
-   <step type="double">0.001</step>
+   <command>nasal</command>
+   <script>controls.elevatorTrim(1)</script>
   </binding>
  </button>
 
@@ -142,9 +75,8 @@ joystick, and that the first button is the trigger.
   <desc>Elevator trim down</desc>
   <repeatable type="bool">true</repeatable>
   <binding>
-   <command>property-adjust</command>
-   <property>/controls/flight/elevator-trim</property>
-   <step type="double">-0.001</step>
+   <command>nasal</command>
+   <script>controls.elevatorTrim(-1)</script>
   </binding>
  </button>
 
diff --git a/Input/Joysticks/Default/joystick.xml b/Input/Joysticks/Default/joystick.xml
index a472aed7a..dfe6d2d50 100644
--- a/Input/Joysticks/Default/joystick.xml
+++ b/Input/Joysticks/Default/joystick.xml
@@ -34,87 +34,21 @@ $Id$
  <axis n="2">
   <desc>Throttle</desc>
   <binding>
-   <command>property-scale</command>
-   <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/engines/engine[1]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[2]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[3]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[4]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[5]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[6]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/engines/engine[7]/throttle</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
+   <command>nasal</command>
+   <script>controls.throttleAxis()</script>
   </binding>
  </axis>
 
  <button n="0">
   <desc>Brakes</desc>
   <binding>
-   <command>property-assign</command>
-   <property>/controls/gear/wheel[0]/brake</property>
-   <value type="double">1.0</value>
-  </binding>
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/gear/wheel[1]/brake</property>
-   <value type="double">1.0</value>
-  </binding>
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/gear/wheel[2]/brake</property>
-   <value type="double">1.0</value>
+   <command>nasal</command>
+   <script>props.setAll("/controls/gear/wheel", "brake", 1)</script>
   </binding>
   <mod-up>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/gear/wheel[0]/brake</property>
-    <value type="double">0.0</value>
-   </binding>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/gear/wheel[1]/brake</property>
-    <value type="double">0.0</value>
-   </binding>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/gear/wheel[2]/brake</property>
-    <value type="double">0.0</value>
+  <binding>
+    <command>nasal</command>
+    <script>props.setAll("/controls/gear/wheel", "brake", 0)</script>
    </binding>
   </mod-up>
  </button>
@@ -123,9 +57,8 @@ $Id$
   <desc>Elevator trim up</desc>
   <repeatable type="bool">true</repeatable>
   <binding>
-   <command>property-adjust</command>
-   <property>/controls/flight/elevator-trim</property>
-   <step type="double">0.001</step>
+   <command>nasal</command>
+   <script>controls.elevatorTrim(1)</script>
   </binding>
  </button>
 
@@ -133,9 +66,8 @@ $Id$
   <desc>Elevator trim down</desc>
   <repeatable type="bool">true</repeatable>
   <binding>
-   <command>property-adjust</command>
-   <property>/controls/flight/elevator-trim</property>
-   <step type="double">-0.001</step>
+   <command>nasal</command>
+   <script>controls.elevatorTrim(-1)</script>
   </binding>
  </button>