diff --git a/Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml b/Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml
index 1f0f6dad6..207417939 100644
--- a/Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml
+++ b/Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<!-- 
+<!--
 ************************************************************************
 *
 * Bindings or Thrustmaster Top Gun Fox 2 Pro USB joystick (see joysticks.xml in fgfsbase dir)
@@ -13,13 +13,13 @@
 * Axis 4: Horizontal Hat
 * Axis 5: Vertical Hat
 *
-* Button 0: (Trigger) elevator trim down   
+* Button 0: (Trigger) elevator trim down
 * Button 1: (yellow and black button) all brakes
-* Button 2: (side button above trigger) gear up/down             
-* Button 3: (right button, next to yellow and black button) elevator trim up 
-* Button 4: (outside bottom button) flap up           
-* Button 5: (middle bottom button) center rudder           
-* Button 6: (inside bottom button) flap down           
+* Button 2: (side button above trigger) gear up/down
+* Button 3: (right button, next to yellow and black button) elevator trim up
+* Button 4: (outside bottom button) flap up
+* Button 5: (middle bottom button) center rudder
+* Button 6: (inside bottom button) flap down
 * Borrowed heavily from sidewinder.xml
 *		Thank you, sidewinder.xml!
 ************************************************************************
@@ -27,6 +27,7 @@
 
 <PropertyList>
  <name>Top Gun Fox 2  Pro </name>
+ <name>THRUSTMASTER Top Gun Fox 2  Pro </name>
 
  <axis>
   <number>
@@ -39,12 +40,12 @@
   <binding>
    <command>property-scale</command>
    <property>/controls/flight/aileron</property>
-   <offset type="double">+0.0</offset>	
+   <offset type="double">+0.0</offset>
    <factor type="double">+1.0</factor>
   </binding>
  </axis>
 
- <axis n="1">
+ <axis>
   <number>
    <unix>1</unix>
    <windows>1</windows>
@@ -63,7 +64,7 @@
  <axis>
   <number>
    <unix>2</unix>
-   <windows>2</windows>
+   <windows>3</windows>
    <mac>2</mac>
   </number>
   <desc>Rudder</desc>
@@ -76,76 +77,15 @@
   </binding>
  </axis>
 
- <axis >
-  <number>
-   <unix>3</unix>
-   <windows>3</windows>
-   <mac>3</mac>
-  </number>
-  <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>
-  </binding>
- </axis>
-
  <axis>
+  <desc>Throttle</desc>
   <number>
-   <unix>2</unix>
+   <unix>3</unix>
    <windows>2</windows>
-   <mac>2</mac>
   </number>
-  <desc>Rudder</desc>
-  <dead-band type="double">0.02</dead-band>
   <binding>
-   <command>property-scale</command>
-   <property>/controls/flight/rudder</property>
-   <offset type="double">0.0</offset>
-   <factor type="double">1.0</factor>
+   <command>nasal</command>
+   <script>controls.throttleAxis()</script>
   </binding>
  </axis>
 
@@ -153,9 +93,8 @@
   <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(0.75)</script>
   </binding>
  </button>
 
@@ -163,36 +102,26 @@
   <desc>Brakes</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/gear/wheel[0]/brake</property>
+   <property>/controls/gear/brake-left</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>
+   <property>/controls/gear/brake-right</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/gear/wheel[0]/brake</property>
+    <property>/controls/gear/brake-left</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/gear/wheel[1]/brake</property>
+    <property>/controls/gear/brake-right</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>
-</mod-up>
+  </mod-up>
  </button>
 
  <button n="2">
@@ -208,9 +137,8 @@
   <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(-0.75)</script>
   </binding>
  </button>
 
@@ -218,12 +146,11 @@
   <desc>Flaps up</desc>
   <repeatable>false</repeatable>
   <binding>
-   <command>property-adjust</command>
-   <property>/controls/flight/flaps</property>
-   <step type="double">0.34</step>
+   <command>nasal</command>
+   <script>controls.stepFlaps(-1)</script>
   </binding>
  </button>
- 
+
  <button n="5">
   <desc>Center rudder</desc>
   <repeatable>false</repeatable>
@@ -238,9 +165,8 @@
   <desc>Flaps down</desc>
   <repeatable>false</repeatable>
   <binding>
-   <command>property-adjust</command>
-   <property>/controls/flight/flaps</property>
-   <step type="double">-0.34</step>
+   <command>nasal</command>
+   <script>controls.stepFlaps(1)</script>
   </binding>
  </button>