diff --git a/Input/Joysticks/Logitech/extreme-3d-pro.xml b/Input/Joysticks/Logitech/extreme-3d-pro.xml
index 4d4b9a490..737d0d842 100644
--- a/Input/Joysticks/Logitech/extreme-3d-pro.xml
+++ b/Input/Joysticks/Logitech/extreme-3d-pro.xml
@@ -27,6 +27,8 @@ $Id$
 
  <name>Logitech Extreme Digital 3D Pro</name>
  <name>Logitech Logitech Extreme 3D Pro</name>
+ <name>Logitech Extreme 3D Pro</name>
+ <name>Logitech Extreme 3D Pro USB</name>
 
  <axis n="0">
   <desc>Aileron</desc>
@@ -47,8 +49,12 @@ $Id$
   </binding>
  </axis>
 
- <axis n="2">
+ <axis>
   <desc>Rudder</desc>
+  <number>
+   <unix>2</unix>
+   <windows>3</windows>
+  </number>
   <binding>
    <command>property-scale</command>
    <property>/controls/flight/rudder</property>
@@ -56,16 +62,24 @@ $Id$
   </binding>
  </axis>
 
- <axis n="3">
+ <axis>
   <desc>Throttle</desc>
+  <number>
+   <unix>3</unix>
+   <windows>2</windows>
+  </number>
   <binding>
    <command>nasal</command>
    <script>controls.throttleAxis()</script>
   </binding>
  </axis>
 
- <axis n="4">
+ <axis>
   <desc>View Direction</desc>
+  <number>
+   <unix>4</unix>
+   <windows>6</windows>
+  </number>
   <low>
    <repeatable>true</repeatable>
    <binding>
@@ -84,8 +98,12 @@ $Id$
   </high>
  </axis>
 
- <axis n="5">
+ <axis>
   <desc>View Elevation</desc>
+  <number>
+   <unix>5</unix>
+   <windows>7</windows>
+  </number>
   <low>
    <repeatable>true</repeatable>
    <binding>
diff --git a/Input/Joysticks/Logitech/extreme-3d-win.xml b/Input/Joysticks/Logitech/extreme-3d-win.xml
deleted file mode 100644
index c1ede621f..000000000
--- a/Input/Joysticks/Logitech/extreme-3d-win.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0"?>
-<!-- edited with XMLSPY v2004 rel. 3 U (http://www.xmlspy.com) by Harold Roberts (none) -->
-<!--************************************************************************
-* Bindings for Logitech Extreme 3D Pro USB joystick.
-*
-*
-* Axis 0: ailerons
-* Axis 1: elevator
-* Axis 2 (slider): throttle
-* Axis 3 (twist): rudder
-* Axes 6 and 7 (hat): view direction
-*
-* Button  0: (trigger) all brakes
-* Button  1: (2 Thumb Button) unassigned
-* Button  2: (3 Below left of hat) elevator trim down
-* Button  5: (4 Below right of hat) flap down
-* Button  4: (5 left of hat) elevator trim up
-* Button  3: (6 right of hat) flap up
-* Button  6: (7 Upper left on base) left brake only
-* Button  7: (8 Upper right on base) right brake only
-* Button  8: (9 Middle left on base) External Views
-* Button  9: (10 Middle right on base) unassigned
-* Button 10: (11 Lower left on base) Richer Mixture
-* Button 11: (12 Lower right on base) Leaner Mixture
-
-************************************************************************
-$Id$
--->
-<PropertyList>
-	<name>Logitech Extreme 3D Pro USB</name>
-	<axis n="0">
-		<desc>Aileron</desc>
-		<binding>
-			<command>property-scale</command>
-			<property>/controls/flight/aileron</property>
-			<squared type="bool">true</squared>
-		</binding>
-	</axis>
-	<axis n="1">
-		<desc>Elevator</desc>
-		<binding>
-			<command>property-scale</command>
-			<property>/controls/flight/elevator</property>
-			<factor type="double">-1.0</factor>
-			<squared type="bool">true</squared>
-		</binding>
-	</axis>
-	<axis n="2">
-		<desc>Throttle</desc>
-		<binding>
-			<command>nasal</command>
-			<script>controls.throttleAxis()</script>
-		</binding>
-	</axis>
-	<axis n="3">
-		<desc>Rudder</desc>
-		<binding>
-			<command>property-scale</command>
-			<property>/controls/flight/rudder</property>
-			<factor type="double">1.0</factor>
-		</binding>
-	</axis>
-	<axis n="6">
-		<desc>View Direction</desc>
-		<low>
-			<repeatable>true</repeatable>
-			<binding>
-				<command>property-adjust</command>
-				<property>/sim/current-view/goal-heading-offset-deg</property>
-				<step type="double">1.0</step>
-			</binding>
-		</low>
-		<high>
-			<repeatable>true</repeatable>
-			<binding>
-				<command>property-adjust</command>
-				<property>/sim/current-view/goal-heading-offset-deg</property>
-				<step type="double">-1.0</step>
-			</binding>
-		</high>
-	</axis>
-	<axis n="7">
-		<desc>View Elevation</desc>
-		<low>
-			<repeatable>true</repeatable>
-			<binding>
-				<command>property-adjust</command>
-				<property>/sim/current-view/goal-pitch-offset-deg</property>
-				<step type="double">1.0</step>
-			</binding>
-		</low>
-		<high>
-			<repeatable>true</repeatable>
-			<binding>
-				<command>property-adjust</command>
-				<property>/sim/current-view/goal-pitch-offset-deg</property>
-				<step type="double">-1.0</step>
-			</binding>
-		</high>
-	</axis>
-	<button n="0">
-         <desc>Brakes</desc>
-         <binding>
-          <command>property-assign</command>
-          <property>/controls/gear/brake-left</property>
-          <value type="double">1.0</value>
-         </binding>
-         <binding>
-          <command>property-assign</command>
-          <property>/controls/gear/brake-right</property>
-          <value type="double">1.0</value>
-         </binding>
-         <mod-up>
-          <binding>
-           <command>property-assign</command>
-           <property>/controls/gear/brake-left</property>
-           <value type="double">0.0</value>
-          </binding>
-          <binding>
-           <command>property-assign</command>
-           <property>/controls/gear/brake-right</property>
-           <value type="double">0.0</value>
-          </binding>
-         </mod-up>
-        </button>
-	<button n="4">
-		<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>
-		</binding>
-	</button>
-	<button n="2">
-		<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>
-		</binding>
-	</button>
-	<button n="5">
-		<desc>Flaps down</desc>
-		<repeatable>false</repeatable>
-		<binding>
-			<command>nasal</command>
-			<script>controls.flapsDown(1)</script>
-		</binding>
-		<mod-up>
-			<binding>
-				<command>nasal</command>
-				<script>controls.flapsDown(0)</script>
-			</binding>
-		</mod-up>
-	</button>
-	<button n="3">
-		<desc>Flaps up</desc>
-		<repeatable>false</repeatable>
-		<binding>
-			<command>nasal</command>
-			<script>controls.flapsDown(-1)</script>
-		</binding>
-		<mod-up>
-			<binding>
-				<command>nasal</command>
-				<script>controls.flapsDown(0)</script>
-			</binding>
-		</mod-up>
-	</button>
-	<button n="7">
-		<desc>Right brake</desc>
-		<binding>
-			<command>property-assign</command>
-			<property>/controls/gear/brake-right</property>
-			<value type="double">1.0</value>
-		</binding>
-		<mod-up>
-			<binding>
-				<command>property-assign</command>
-				<property>/controls/gear/brake-right</property>
-				<value type="double">0.0</value>
-			</binding>
-		</mod-up>
-	</button>
-	<button n="6">
-		<desc>Left brake</desc>
-		<binding>
-			<command>property-assign</command>
-			<property>/controls/gear/brake-left</property>
-			<value type="double">1.0</value>
-		</binding>
-		<mod-up>
-			<binding>
-				<command>property-assign</command>
-				<property>/controls/gear/brake-right</property>
-				<value type="double">0.0</value>
-			</binding>
-		</mod-up>
-	</button>
-	<button n="8">
-		<desc>External Views</desc>
-		<repeatable type="bool">false</repeatable>
-		<binding>
-			<command>view-cycle</command>
-			<step type="double">1</step>
-		</binding>
-	</button>
-	<button n="10">
-		<desc>Richer Mixture</desc>
-		<repeatable type="bool">true</repeatable>
-		<binding>
-			<command>property-adjust</command>
-			<property>/controls/engines/engine[0]/mixture</property>
-			<step type="double">+0.01</step>
-		</binding>
-		<binding>
-			<command>property-adjust</command>
-			<property>/controls/engines/engine[1]/mixture</property>
-			<step type="double">+0.01</step>
-		</binding>
-	</button>
-	<button n="11">
-		<desc>Leaner Mixture</desc>
-		<repeatable type="bool">true</repeatable>
-		<binding>
-			<command>property-adjust</command>
-			<property>/controls/engines/engine[0]/mixture</property>
-			<step type="double">-0.01</step>
-		</binding>
-		<binding>
-			<command>property-adjust</command>
-			<property>/controls/engines/engine[1]/mixture</property>
-			<step type="double">-0.01</step>
-		</binding>
-	</button>
-</PropertyList>