diff --git a/Huds/Custom/default.xml b/Huds/Custom/default.xml
deleted file mode 100644
index d70f42710..000000000
--- a/Huds/Custom/default.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Preliminary Default Hud.
-November 2000
-Neetha Girish <neetha@ada.ernet.in>
-
-Based on Default Panel by David Megginson, david@megginson.com.
-
-This is a Hud configuration file for the open-source flight
-simulator FlightGear (www.flightgear.org).  The file is an XML-encoded
-FlightGear property list defining the Hud.
-
-Each instrument is, itself, defined in an XML-encoded property list
-in a separate file.
-
--->
-
-<PropertyList>
- <depreciated/>
-
- <name>Fighter Hud</name>
-
- <instruments>
-
-  <hudladder>
-   <path>Huds/Instruments/Custom/hudladder.xml</path>
-  </hudladder>
-
-  <hudcard>
-   <path>Huds/Instruments/Custom/hudcard.xml</path>
-  </hudcard>
-
-  <instrlabel>
-   <path>Huds/Instruments/Custom/instrlabel.xml</path>
-  </instrlabel>
-
- </instruments>
-
-</PropertyList>
diff --git a/Huds/Default/default.xml b/Huds/Default/default.xml
deleted file mode 100644
index 848f6203c..000000000
--- a/Huds/Default/default.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Preliminary Default Hud.
-November 2000
-Neetha Girish <neetha@ada.ernet.in>
-
-Based on Default Panel by David Megginson, david@megginson.com.
-
-This is a Hud configuration file for the open-source flight
-simulator FlightGear (www.flightgear.org).  The file is an XML-encoded
-FlightGear property list defining the Hud.
-
-Each instrument is, itself, defined in an XML-encoded property list
-in a separate file.
-
--->
-
-<PropertyList>
- <depreciated/>
-
- <name>Default Aircraft Hud</name>
-
- <instruments>
-
-  <hudladder>
-   <path>Huds/Instruments/Default/hudladder.xml</path>
-  </hudladder>
-
-  <hudcard>
-  <path>Huds/Instruments/Default/hudcard.xml</path>
-  </hudcard>
-
-
-  <instrlabel>
-   <path>Huds/Instruments/Default/instrlabel.xml</path>
-  </instrlabel>
-
-  <fgTBI>
-   <path>Huds/Instruments/Default/fgtbi.xml</path>
-  </fgTBI>
-
-  <Gload>
-   <path>Huds/Instruments/Default/gload.xml</path>
-  </Gload>
-
-<!-- disabled by default because the runway projection and selection has some
-     issues ...
-  <runwayhud>
-   <path>Huds/Instruments/Default/runwayinstr.xml</path>
-  </runwayhud>
--->
-
- </instruments>
-
-</PropertyList>
diff --git a/Huds/Engineering/default.xml b/Huds/Engineering/default.xml
deleted file mode 100644
index a84c28a34..000000000
--- a/Huds/Engineering/default.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Preliminary Default Hud.
-November 2000
-Neetha Girish <neetha@ada.ernet.in>
-
-Based on Default Panel by David Megginson, david@megginson.com.
-
-This is a Hud configuration file for the open-source flight
-simulator FlightGear (www.flightgear.org).  The file is an XML-encoded
-FlightGear property list defining the Hud.
-
-Each instrument is, itself, defined in an XML-encoded property list
-in a separate file.
-
--->
-
-<PropertyList>
- <depreciated/>
-
- <name>Default Aircraft Hud</name>
-
- <instruments>
-
-  <hudladder>
-   <path>Huds/Instruments/Default/hudladder.xml</path>
-  </hudladder>
-
-  <hudcard>
-   <path>Huds/Instruments/Default/hudcard.xml</path>
-  </hudcard>
-
-  <instrlabel>
-   <path>Huds/Instruments/Engineering/instrlabel.xml</path>
-  </instrlabel>
-
-  <fgTBI>
-   <path>Huds/Instruments/Default/fgtbi.xml</path>
-  </fgTBI>
-
- </instruments>
-
-</PropertyList>
diff --git a/Huds/Instruments/Custom/fgtbi.xml b/Huds/Instruments/Custom/fgtbi.xml
deleted file mode 100644
index cde8f9f8f..000000000
--- a/Huds/Instruments/Custom/fgtbi.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<PropertyList>
-
- <tbis>
-
-  <f1>
-  <name>fgTBI_Instrument</name>
-  <x>290</x>
-  <y>200</y>
-  <width>60</width>
-  <height>10</height>
-  <maxBankAngle>45.0</maxBankAngle>
-  <maxSlipAngle>5.0</maxSlipAngle>
-  <gap_width>5</gap_width>
-  <working>true</working>
-  <tsi>true</tsi> <!-- suma -->
-     <rad>150.0</rad>  <!-- suma -->
-
-  </f1>
-
- </tbis>
-
-</PropertyList>
diff --git a/Huds/Instruments/Custom/hudcard.xml b/Huds/Instruments/Custom/hudcard.xml
deleted file mode 100644
index fe1f08f61..000000000
--- a/Huds/Instruments/Custom/hudcard.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-HudCards for ADA.
-
-Started November 2000 by Neetha Girish, neetha@ada.ernet.in
-
-Based on Panel Instruments by David Megginson, david@megginson.com.
-
-This is an instrument configuration file for the open-source flight
-simulator FlightGear (www.flightgear.org).  The file is an XML-encoded
-FlightGear property list defining the instrument's properties.
-
--->
-
-<PropertyList>
-
- <cards>
-
-  <c1>
-<!-- changes made by suma this angle is to rotate thru the envt.-->
-<!-- suma
-     To display the hud-card as a type of gauge, radius and number of divisions are included.
-     radius-> of the circle and divisions-> number of divisions in a circle. so it should be multiple of 4.
-     all the moved values are used when the type="tape". and when the type="gauge" radius and divisions are used.
--->
-
-
-<!-- for a vertical scale the option value should be 6,10 or 14. 
-       6  -> left side arrow
-	 10 -> right side arrow
-       14 -> both sides arrow -->
-<!-- for a horizontal scale the option value should be 6,10 or 14. 
-       4  -> top facing arrow 
-	 8 ->  bottom facing arrow
-       12 -> both sides arrow -->
-
-
-   <name>Gyrocompass</name>
-   <x>260</x> <!--  260 -->
-   <y>248</y> <!-- 248 -->
-   <width>120</width> 
-   <height>28</height>
-   <loadfn>heading</loadfn>
-   <options>4</options>		<!-- Read ReadMe.xmlhud -->
-   <maxValue>360.0</maxValue>
-   <minValue>0.0</minValue>
-   <disp_scaling>0.1</disp_scaling> <!-- 0.1 -->
-   <major_divs>10</major_divs>
-   <minor_divs>5</minor_divs>
-   <modulator>360</modulator>
-   <value_span>60.0</value_span>
-   <type>tape</type>  <!-- when the type is "gauge",only radius is needed. -->
-   	<tick_bottom>false</tick_bottom>
-	<tick_top>false</tick_top>
-	<tick_right>false</tick_right>
-   	<tick_left>false</tick_left>
-      <cap_bottom>false</cap_bottom>
-      <cap_top>false</cap_top>
-   	<cap_right>false</cap_right>
-      <cap_left>false</cap_left>
-   	<marker_offset>10.0</marker_offset>
-   	<enable_pointer>false</enable_pointer>
-   	<pointer_type>fixed</pointer_type>  <!-- this should be always fixed type for compass -->
-      <tick_type>line</tick_type>
-      <tick_length>variable</tick_length>
-   <working>true</working>
-   	<radius>40.0</radius> <!-- for type=gauge -->
- 	<divisions>12</divisions> <!-- it should be multiple of 4 -->
-      <zoom>0</zoom> <!-- for VSI -->
-   </c1>
-
-  <c2>
-   <name>AOA</name>
-   <x>180</x> <!-- 175 -->
-   <y>100</y> 
-   <width>28</width>
-   <height>100</height>
-   <loadfn>aoa</loadfn>
-   <options>6</options> 
-   <maxValue>20.0</maxValue>
-   <minValue>0.0</minValue>
-   <disp_scaling>1.0</disp_scaling>
-   <major_divs>4</major_divs>
-   <minor_divs>2</minor_divs>
-   <modulator>0</modulator>
-   <value_span>20.0</value_span>
-   <type>tape</type>
-   	<tick_bottom>false</tick_bottom>
-   	<tick_top>false</tick_top>
-   	<tick_right>false</tick_right>
-   	<tick_left>false</tick_left>
-   	<cap_bottom>false</cap_bottom>
-   	<cap_top>false</cap_top>
-   	<cap_right>false</cap_right>
-   	<cap_left>false</cap_left>
-   	<marker_offset>10.0</marker_offset>
-   	<enable_pointer>true</enable_pointer>
-   	<pointer_type>moving</pointer_type>
-   	<tick_type>circle</tick_type>
-   	<tick_length>constant</tick_length>
-   <working>true</working>
-   	<radius>30.0</radius>  <!-- for type=gauge -->
-	<divisions>12</divisions> <!-- it should be multiple of 4 -->
-  <zoom>0</zoom> <!-- for VSI -->
-
-  </c2>
-
-  <c3>
-   <name>NormalAcceleration</name>
-   <x>140</x>
-   <y>110</y>
-   <width>18</width>
-   <height>100</height>
-   <loadfn>anzg</loadfn>
-   <options>6</options>
-   <maxValue>9.0</maxValue>
-   <minValue>-3.0</minValue>
-   <disp_scaling>1</disp_scaling>
-   <major_divs>2</major_divs>
-   <minor_divs>1</minor_divs>
-   <modulator>0</modulator>
-   <value_span>12.0</value_span>
-   <type>tape</type>
-   	<tick_bottom>false</tick_bottom>
-   	<tick_top>false</tick_top>
-   	<tick_right>false</tick_right>
-   	<tick_left>false</tick_left>
-   	<cap_bottom>false</cap_bottom>
-   	<cap_top>false</cap_top>
-   	<cap_right>false</cap_right>
-   	<cap_left>false</cap_left>
-   	<marker_offset>10.0</marker_offset>
-   	<enable_pointer>true</enable_pointer>
-   	<pointer_type>moving</pointer_type>
-   	<tick_type>line</tick_type>
-   	<tick_length>variable</tick_length>
-   <working>false</working>
-   	<radius>40.0</radius> <!-- for type=gauge -->
-	<divisions>12</divisions> <!-- it should be multiple of 4 -->
-   <zoom>0</zoom> <!-- for VSI -->
-
- </c3>
-<!-- for moving type pointer adjust the values of value_span, major_divs, minor_divs, disp_scaling -->
-  <c4>
-   <name>VSI</name>
-   <x>430</x> <!-- 445 -->
-   <y>50</y>
-   <width>28</width>
-   <height>150</height>
-   <loadfn>climb</loadfn>
-   <options>10</options>
-   <maxValue>1000.0</maxValue>
-   <minValue>-1000.0</minValue>
-   <disp_scaling>1.0</disp_scaling>
-   <major_divs>200</major_divs>
-   <minor_divs>100</minor_divs>
-   <modulator>0</modulator>
-   <value_span>2000.0</value_span> <!-- set value_span = maxValue + minValue for moving type pointer -->
-   <type>tape</type>
-   	<tick_bottom>false</tick_bottom>
-   	<tick_top>false</tick_top>
-   	<tick_right>false</tick_right>
-   	<tick_left>false</tick_left>
-   	<cap_bottom>false</cap_bottom>
-   	<cap_top>false</cap_top>
-   	<cap_right>false</cap_right>
-   	<cap_left>false</cap_left>
-   	<marker_offset>10.0</marker_offset>
-   	<enable_pointer>true</enable_pointer>
-   	<pointer_type>moving</pointer_type>
-   	<tick_type>line</tick_type>
-   	<tick_length>variable</tick_length>
-   <working>true</working>
-   <radius>40.0</radius> <!-- for type=gauge -->
-   <divisions>12</divisions> <!-- it should be multiple of 4 -->
-   <zoom>1</zoom> <!-- for VSI -->
-
- </c4>
-
- </cards>
-
-</PropertyList>
diff --git a/Huds/Instruments/Custom/hudladder.xml b/Huds/Instruments/Custom/hudladder.xml
deleted file mode 100644
index dd09558a7..000000000
--- a/Huds/Instruments/Custom/hudladder.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-HudLadder for ADA.
-
-Started November 2000 by Neetha Girish, neetha@ada.ernet.in
-
-Based on Panel Instruments by David Megginson, david@megginson.com.
-
-This is an instrument configuration file for the open-source flight
-simulator FlightGear (www.flightgear.org).  The file is an XML-encoded
-FlightGear property list defining the instrument's properties.
-
--->
-
-<PropertyList>
-
- <ladders>
-
-  <l1>
-  <name>Climb/Dive Ladder</name>
-  <x>260</x>
-  <y>150</y>  <!-- 150 -->
-  <width>120</width>
-  <height>180</height> <!-- 180 -->
-  <compression_factor>12.6316</compression_factor>
-  <loadfn>roll</loadfn>
-  <loadfn1>pitch</loadfn1>
-  <span_units>45</span_units>
-  <division_units>5.0</division_units>
-  <screen_hole>70</screen_hole>
-  <lbl_pos>0</lbl_pos>
-  <enable_frl>true</enable_frl>
-  <enable_target_spot>false</enable_target_spot>
-  <enable_velocity_vector>true</enable_velocity_vector>
-  <enable_drift_marker>true</enable_drift_marker>
-  <enable_alpha_bracket>true</enable_alpha_bracket>
-  <enable_energy_marker>true</enable_energy_marker>
-  <enable_climb_dive_marker>true</enable_climb_dive_marker>
-  <enable_glide_slope_marker>true</enable_glide_slope_marker>
-  <glide_slope>-4.0</glide_slope>
-  <enable_energy_worm>true</enable_energy_worm>
-  <enable_waypoint_marker>true</enable_waypoint_marker>
-  <working>true</working>
-  <zenith>1</zenith>
-  <nadir>1</nadir>
-  <hat>1</hat>
-
-  </l1>
-
- </ladders>
-
-</PropertyList>
diff --git a/Huds/Instruments/Custom/instrlabel.xml b/Huds/Instruments/Custom/instrlabel.xml
deleted file mode 100644
index 00e0c3aa6..000000000
--- a/Huds/Instruments/Custom/instrlabel.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<PropertyList>
-
- <labels>
-
-  <i1>
-   <name>digitalkias</name>
-   <x>130</x>
-   <y>265</y>
-   <width>40</width> <!-- specify the width of the label box here according to label format-->
-   <height>30</height>
-   <data_source>speed</data_source>
-   <label_format>%5.0f</label_format>
-   <pre_label_string>NULL</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>		<!-- Read ReadMe.xmlhud  -->
-   <justification>2</justification>
-   <blinking>0</blinking>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-   <label_box>false</label_box>
-   <working>true</working>
-  </i1>
-
-  <i2>
-   <name>machno</name>
-   <x>140</x>
-   <y>245</y> 
-   <width>40</width>
-   <height>30</height>
-   <data_source>mach</data_source>
-   <label_format>%5.2f</label_format>
-   <pre_label_string>NULL</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>2</justification>
-   <blinking>0</blinking>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-   <label_box>false</label_box>
-   <working>true</working>
-  </i2>
-
-  <i3>
-   <name>pressurealtitude</name>
-   <x>430</x>
-   <y>265</y> 
-   <width>40</width>
-   <height>30</height>
-   <data_source>altitude</data_source>
-   <label_format>%5.0f</label_format>
-   <pre_label_string>NULL</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-   <label_box>false</label_box>
-   <working>true</working>
-   <digits>1</digits>
-  </i3>
-
-  <i4>
-   <name>radioaltitude</name>
-   <x>430</x>
-   <y>245</y> 
-   <width>40</width>
-   <height>30</height>
-   <data_source>agl</data_source>
-   <label_format>%5.0f</label_format>
-   <pre_label_string>NULL</pre_label_string>
-   <post_label_string> R</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-   <label_box>false</label_box>
-   <working>true</working>
-  </i4>
-
-  <i5>
-   <name>xposn</name>
-   <x>560</x>
-   <y>440</y> 
-   <width>40</width>
-   <height>30</height>
-   <data_source>aux4</data_source>
-   <label_format>%5.0f</label_format>
-   <pre_label_string>NULL</pre_label_string>
-   <post_label_string> m</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-   <label_box>false</label_box>
-   <working>true</working>
-  </i5>
-
-  <i6>
-   <name>pla</name>
-   <x>560</x>
-   <y>430</y> 
-   <width>40</width>
-   <height>30</height>
-   <data_source>throttleval</data_source>
-   <label_format>%5.0f</label_format>
-   <pre_label_string>NULL</pre_label_string>
-   <post_label_string> pla</post_label_string>
-   <scale_data>130.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-   <label_box>false</label_box>
-   <working>true</working>
-  </i6>
- 
-  <i7>
-   <name>FrameRate</name>
-   <x>0</x>
-   <y>25</y> 
-   <width>60</width>
-   <height>10</height>
-   <data_source>framerate</data_source>
-   <label_format>%3.1f</label_format>
-   <pre_label_string>NULL</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>1</justification>
-   <blinking>0</blinking>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-   <label_box>false</label_box>
-   <working>true</working>
-  </i7>
-
-  <i8>
-   <name>acceleration</name>
-   <x>140</x>
-   <y>90</y> 
-   <width>20</width>
-   <height>30</height>
-   <data_source>anzg</data_source>
-   <label_format>%1.1f</label_format>
-   <pre_label_string>blank</pre_label_string>
-   <post_label_string>NULL</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>1</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-   <label_box>true</label_box>
-   <working>true</working>
-  </i8>
-
-
-  <lat>
-   <name>lattitude</name>
-   <x>40</x>
-   <y>40</y>
-   <width>1</width>
-   <height>10</height>
-   <data_source>latitude</data_source>
-   <label_format>%s%</label_format>
-   <pre_label_string>blank</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>1</justification>
-   <blinking>0</blinking>
-   <latitude>true</latitude>
-   <longitude>false</longitude>
-   <label_box>false</label_box>
-   <working>true</working>
-  </lat>
-
-  <lon>
-   <name>longitude</name>
-   <x>550</x>
-   <y>40</y>
-   <width>1</width>
-   <height>10</height>
-   <data_source>longitude</data_source>
-   <label_format>%s%</label_format>
-   <pre_label_string>blank</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>1</justification>
-   <blinking>0</blinking>
-   <latitude>false</latitude>
-   <longitude>true</longitude>	
-   <working>true</working>
-  </lon>
-
-</labels>
-
-</PropertyList>
-
diff --git a/Huds/Instruments/Default/fgtbi.xml b/Huds/Instruments/Default/fgtbi.xml
deleted file mode 100644
index 522a76217..000000000
--- a/Huds/Instruments/Default/fgtbi.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<PropertyList>
-
- <tbis>
-
-  <f1>
-  <name>fgTBI_Instrument</name>
-  <x>290</x>
-  <y>45</y>
-  <width>60</width>
-  <height>10</height>
-  <loadfn>roll</loadfn>
-  <loadfn1>sideslip</loadfn1>
-  <maxBankAngle>45.0</maxBankAngle>
-  <maxSlipAngle>5.0</maxSlipAngle>
-  <gap_width>5</gap_width>
-  <working>true</working>
-  </f1>
-
- </tbis>
-
-</PropertyList>
diff --git a/Huds/Instruments/Default/gload.xml b/Huds/Instruments/Default/gload.xml
deleted file mode 100644
index f7ff03dee..000000000
--- a/Huds/Instruments/Default/gload.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-<!--
-# Gload.xml file
-# Defines a control that displays gload on the HUD
-# Created by Keerti Bhamidpati (bhamidip@uiuc.edu)
-
--->
-
-<PropertyList>
-
- <labels>
-
-  <i1>
-   <name>G Load</name>
-   <x>41</x>
-   <y>345</y> 
-   <width>40</width>
-   <height>30</height>
-   <data_source>anzg</data_source>	<!-- Name of the function to be called, here get_anzg() is called -->
-   <label_format>%4.2f</label_format>	<!-- The Label Format -->
-   <pre_label_string>NULL</pre_label_string> <!-- String to be written Pre Label -->
-   <post_label_string> g</post_label_string> <!-- String to be written Post Label -->
-   <scale_data>1.0</scale_data>
-   <options>4</options>					<!-- Read Tape options or Hud.hxx -->
-   <justification>0</justification>	<!-- Justify the label, 0=LEFT_JUSTIFY, 1=CENTER_JUSTIFY, 2=RIGHT_JUSTIFY -->
-   <blinking>0</blinking>		<!-- Yet to be implemented  -->
-   <working>true</working>
-   <latitude>false</latitude>		<!-- True if the label is to display Lattitude (special label, displays deg.min.sec)-->
-   <longitude>false</longitude>     <!-- True if the label is to display Longitude (special label, displays deg.min.sec)-->
-  </i1>
-               
- </labels>
-
-</PropertyList>
diff --git a/Huds/Instruments/Default/hudcard.xml b/Huds/Instruments/Default/hudcard.xml
deleted file mode 100644
index 932715265..000000000
--- a/Huds/Instruments/Default/hudcard.xml
+++ /dev/null
@@ -1,285 +0,0 @@
-<PropertyList>
-
- <cards>
-
-  <c1>
-   <name>Gyrocompass</name>
-   <x>220</x>
-   <y>430</y>
-   <width>200</width>
-   <height>28</height>
-   <loadfn>heading</loadfn>
-   <options>4</options>	<!-- HUDS_TOP -->	<!--  Read ReadMe.xmlhud for Values  -->
-   <maxValue>360.0</maxValue>
-   <minValue>0.0</minValue>
-   <disp_scaling>1.0</disp_scaling>
-   <major_divs>5</major_divs>
-   <minor_divs>1</minor_divs>
-   <modulator>360</modulator>
-   <value_span>25.0</value_span>
-   <type>tape</type>
-   <tick_bottom>false</tick_bottom>
-   <tick_top>false</tick_top>
-   <tick_right>true</tick_right>
-   <tick_left>true</tick_left>
-   <cap_bottom>true</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <tick_type>line</tick_type>
-   <tick_length>variable</tick_length>
-   <working>true</working>
-  </c1>
-
-  <c2>
-   <name>AMSL</name>
-   <x>565</x>
-   <y>140</y> 
-   <width>35</width>
-   <height>200</height>
-   <loadfn>altitude</loadfn>
-   <options>6</options> <!-- HUDS_LEFT | HUDS_VERT -->
-   <maxValue>5000.0</maxValue>
-   <minValue>-1000.0</minValue>
-   <disp_scaling>1.0</disp_scaling>
-   <major_divs>100</major_divs>
-   <minor_divs>25</minor_divs>
-   <modulator>0</modulator>
-   <value_span>250.0</value_span>
-   <type>tape</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>true</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <tick_type>line</tick_type>
-   <tick_length>variable</tick_length>
-   <working>true</working>
-  </c2>
-
-  <c3>
-   <name>RadioAltimeter</name>
-   <x>438</x>
-   <y>165</y>
-   <width>25</width>
-   <height>150</height>
-   <loadfn>agl</loadfn>
-   <options>6</options> <!-- HUDS_LEFT | HUDS_VERT -->
-   <maxValue>1000.0</maxValue>
-   <minValue>0.0</minValue>
-   <disp_scaling>1.0</disp_scaling>
-   <major_divs>25</major_divs>
-   <minor_divs>5</minor_divs>
-   <modulator>0</modulator>
-   <value_span>200.0</value_span>
-   <type>tape</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>true</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <tick_type>line</tick_type>
-   <tick_length>variable</tick_length>
-   <working>true</working>
-  </c3>
-
-  <c4>
-   <name>KIAS</name>
-   <x>40</x>
-   <y>140</y>
-   <width>28</width>
-   <height>200</height>
-   <loadfn>speed</loadfn>
-   <options>10</options> <!-- HUDS_RIGHT | HUDS_VERT -->
-   <maxValue>200.0</maxValue>
-   <minValue>0.0</minValue>
-   <disp_scaling>1.0</disp_scaling>
-   <major_divs>10</major_divs>
-   <minor_divs>5</minor_divs>
-   <modulator>0</modulator>
-   <value_span>50.0</value_span>
-   <type>tape</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>true</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <tick_type>line</tick_type>
-   <tick_length>variable</tick_length>
-   <working>true</working>
-  </c4>
-
-  <g1>
-   <name>Gauge1</name>
-   <x>270</x>
-   <y>310</y>
-   <width>100</width>
-   <height>20</height>
-   <loadfn>aileronval</loadfn>
-   <options>136</options> <!-- HUDS_BOTTOM | HUDS_NOTEXT -->
-   <maxValue>+1.0</maxValue>
-   <minValue>-1.0</minValue>
-   <disp_scaling>100.0</disp_scaling>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>2.0</value_span>	<!-- (maxValue - minValue) -->
-   <type>gauge</type>
-   <tick_bottom>false</tick_bottom>
-   <tick_top>false</tick_top>
-   <tick_right>true</tick_right>
-   <tick_left>true</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>true</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g1>
-
-  <g2>
-   <name>Gauge2</name>
-   <x>182</x>
-   <y>190</y>
-   <width>20</width>
-   <height>100</height>
-   <loadfn>elevatorval</loadfn>
-   <options>138</options>	<!-- HUDS_RIGHT | HUDS_VERT | HUDS_NOTEXT -->
-   <disp_scaling>-100.0</disp_scaling>
-   <maxValue>+1.0</maxValue>
-   <minValue>-1.0</minValue>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>2.0</value_span>	<!-- (maxValue - minValue) -->
-   <marker_offset>0.0</marker_offset>
-   <type>gauge</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>true</cap_left>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g2>
-
-  <g3>
-   <name>Gauge3</name>
-   <x>270</x>
-   <y>150</y>
-   <width>100</width>
-   <height>20</height>
-   <loadfn>rudderval</loadfn>
-   <options>132</options> <!-- HUDS_TOP | HUDS_NOTEXT -->
-   <maxValue>+1.0</maxValue>
-   <minValue>-1.0</minValue>
-   <disp_scaling>100.0</disp_scaling>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>2.0</value_span>	<!-- (maxValue - minValue) -->
-   <type>gauge</type>
-   <tick_bottom>false</tick_bottom>
-   <tick_top>false</tick_top>
-   <tick_right>true</tick_right>
-   <tick_left>true</tick_left>
-   <cap_bottom>true</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g3>
-
-  <g4>
-   <name>Gauge4</name>
-   <x>15</x>
-   <y>165</y>
-   <width>20</width>
-   <height>150</height>
-   <loadfn>throttleval</loadfn>
-   <options>134</options> <!-- HUDS_VERT | HUDS_LEFT | HUDS_NOTEXT -->
-   <maxValue>1.0</maxValue>
-   <minValue>0.0</minValue>
-   <disp_scaling>100.0</disp_scaling>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>1.0</value_span>	<!-- (maxValue - minValue) -->
-   <type>gauge</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>true</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g4>
-
-  <g5>
-   <name>Gauge5</name>
-   <x>172</x>
-   <y>190</y>
-   <width>10</width>
-   <height>100</height>
-   <loadfn>elevatortrimval</loadfn>
-   <options>134</options>	<!-- HUDS_LEFT | HUDS_VERT | HUDS_NOTEXT -->
-   <disp_scaling>-100.0</disp_scaling>
-   <maxValue>+1.0</maxValue>
-   <minValue>-1.0</minValue>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>2.0</value_span>	<!-- (maxValue - minValue) -->
-   <marker_offset>0.0</marker_offset>
-   <type>gauge</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>false</cap_left>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g5>
-
- </cards>
-
-</PropertyList>
diff --git a/Huds/Instruments/Default/hudladder.xml b/Huds/Instruments/Default/hudladder.xml
deleted file mode 100644
index ca96a9b70..000000000
--- a/Huds/Instruments/Default/hudladder.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<PropertyList>
-
- <ladders>
-
-  <l1>
-  <name>Pitch Ladder</name>
-  <x>260</x>
-  <y>150</y>
-  <width>120</width>
-  <height>180</height>
-  <compression_factor>2.68</compression_factor>
-  <loadfn>roll</loadfn>
-  <loadfn1>pitch</loadfn1>
-  <span_units>45.0</span_units>
-  <division_units>10.0</division_units>
-  <screen_hole>70</screen_hole>
-  <lbl_pos>0</lbl_pos>
-  <enable_frl>false</enable_frl>
-  <enable_target_spot>true</enable_target_spot>
-  <enable_velocity_vector>false</enable_velocity_vector>
-  <enable_drift_marker>false</enable_drift_marker>
-  <enable_alpha_bracket>false</enable_alpha_bracket>
-  <enable_energy_marker>false</enable_energy_marker>
-  <enable_climb_dive_marker>false</enable_climb_dive_marker>
-  <enable_glide_slope_marker>false</enable_glide_slope_marker>
-  <glide_slope>0.0</glide_slope>
-  <enable_energy_worm>false</enable_energy_worm>
-  <enable_waypoint_marker>false</enable_waypoint_marker>
-  <working>true</working>
-  </l1>
-
- </ladders>
-
-</PropertyList>
diff --git a/Huds/Instruments/Default/instrlabel.xml b/Huds/Instruments/Default/instrlabel.xml
deleted file mode 100644
index af2a47cbf..000000000
--- a/Huds/Instruments/Default/instrlabel.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<PropertyList>
-
- <labels>
-
-  <lat>
-   <name>latitude</name>
-   <x>110</x>
-   <y>430</y>
-   <width>1</width>
-   <height>10</height>
-   <data_source>latitude</data_source>
-   <label_format>%s%</label_format>
-   <pre_label_string>blank</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>1</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-   <latitude>true</latitude>
-   <longitude>false</longitude>
-  </lat>
-
-  <lon>
-   <name>longitude</name>
-   <x>530</x>
-   <y>430</y>
-   <width>1</width>
-   <height>10</height>
-   <data_source>longitude</data_source>
-   <label_format>%s%</label_format>
-   <pre_label_string>blank</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>1</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-   <latitude>false</latitude>
-   <longitude>true</longitude>
-  </lon>
-
-</labels>
-
-</PropertyList>
diff --git a/Huds/Instruments/Default/runwayinstr.xml b/Huds/Instruments/Default/runwayinstr.xml
deleted file mode 100644
index fc474c8dc..000000000
--- a/Huds/Instruments/Default/runwayinstr.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<PropertyList>
- <runways>
-  <runway>
-   <name>Runway Hud</name>
-   <x>0</x>
-   <y>0</y>
-   <width>480</width>
-   <height>360</height>
-   <working>true</working>
-   <scale_dist_nm>5</scale_dist_nm>	
-   <line_scale>5.0</line_scale>
-   <arrow_always>false</arrow_always>
-   <arrow_scale>1.0</arrow_scale>
-   <arrow_radius>50.0</arrow_radius>
-   <outer_stipple>-1</outer_stipple>
-   <center_stipple>64250</center_stipple>
-  </runway>
- </runways>
-</PropertyList>
diff --git a/Huds/Instruments/Engineering/fgtbi.xml b/Huds/Instruments/Engineering/fgtbi.xml
deleted file mode 100644
index 522a76217..000000000
--- a/Huds/Instruments/Engineering/fgtbi.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<PropertyList>
-
- <tbis>
-
-  <f1>
-  <name>fgTBI_Instrument</name>
-  <x>290</x>
-  <y>45</y>
-  <width>60</width>
-  <height>10</height>
-  <loadfn>roll</loadfn>
-  <loadfn1>sideslip</loadfn1>
-  <maxBankAngle>45.0</maxBankAngle>
-  <maxSlipAngle>5.0</maxSlipAngle>
-  <gap_width>5</gap_width>
-  <working>true</working>
-  </f1>
-
- </tbis>
-
-</PropertyList>
diff --git a/Huds/Instruments/Engineering/hudcard.xml b/Huds/Instruments/Engineering/hudcard.xml
deleted file mode 100644
index 7cd2402aa..000000000
--- a/Huds/Instruments/Engineering/hudcard.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<PropertyList>
-
- <cards>
-
-  <c1>
-   <name>Gyrocompass</name>
-   <x>220</x>
-   <y>430</y>
-   <width>200</width>
-   <height>28</height>
-   <loadfn>heading</loadfn>
-   <options>4</options>		<!--  Read ReadMe.xmlhud for Values  -->
-   <maxValue>360.0</maxValue>
-   <minValue>0.0</minValue>
-   <disp_scaling>1.0</disp_scaling>
-   <major_divs>5</major_divs>
-   <minor_divs>1</minor_divs>
-   <modulator>360</modulator>
-   <value_span>25.0</value_span>
-   <type>tape</type>
-   <tick_bottom>false</tick_bottom>
-   <tick_top>false</tick_top>
-   <tick_right>true</tick_right>
-   <tick_left>true</tick_left>
-   <cap_bottom>true</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </c1>
-
-  <c2>
-   <name>AMSL</name>
-   <x>565</x>
-   <y>140</y> 
-   <width>35</width>
-   <height>200</height>
-   <loadfn>altitude</loadfn>
-   <options>6</options>
-   <maxValue>5000.0</maxValue>
-   <minValue>-1000.0</minValue>
-   <disp_scaling>1.0</disp_scaling>
-   <major_divs>100</major_divs>
-   <minor_divs>25</minor_divs>
-   <modulator>0</modulator>
-   <value_span>250.0</value_span>
-   <type>tape</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>true</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </c2>
-
-  <c3>
-   <name>RadioAltimeter</name>
-   <x>438</x>
-   <y>165</y>
-   <width>25</width>
-   <height>150</height>
-   <loadfn>agl</loadfn>
-   <options>6</options>
-   <maxValue>1000.0</maxValue>
-   <minValue>0.0</minValue>
-   <disp_scaling>1.0</disp_scaling>
-   <major_divs>25</major_divs>
-   <minor_divs>5</minor_divs>
-   <modulator>0</modulator>
-   <value_span>200.0</value_span>
-   <type>tape</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>true</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </c3>
-
-  <c4>
-   <name>KIAS</name>
-   <x>40</x>
-   <y>140</y>
-   <width>28</width>
-   <height>200</height>
-   <loadfn>speed</loadfn>
-   <options>10</options>
-   <maxValue>200.0</maxValue>
-   <minValue>0.0</minValue>
-   <disp_scaling>1.0</disp_scaling>
-   <major_divs>10</major_divs>
-   <minor_divs>5</minor_divs>
-   <modulator>0</modulator>
-   <value_span>50.0</value_span>
-   <type>tape</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>true</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </c4>
-
-  <g1>
-   <name>Gauge1</name>
-   <x>270</x>
-   <y>310</y>
-   <width>100</width>
-   <height>20</height>
-   <loadfn>aileronval</loadfn>
-   <options>88</options>
-   <maxValue>+1.0</maxValue>
-   <minValue>-1.0</minValue>
-   <disp_scaling>100.0</disp_scaling>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>2.0</value_span>	<!-- (maxValue - minValue) -->
-   <type>gauge</type>
-   <tick_bottom>false</tick_bottom>
-   <tick_top>false</tick_top>
-   <tick_right>true</tick_right>
-   <tick_left>true</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>true</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g1>
-
-  <g2>
-   <name>Gauge2</name>
-   <x>182</x>
-   <y>190</y>
-   <width>20</width>
-   <height>100</height>
-   <loadfn>elevatorval</loadfn>
-   <options>90</options>
-   <maxValue>+1.0</maxValue>
-   <minValue>-1.0</minValue>
-   <disp_scaling>-100.0</disp_scaling>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>2.0</value_span>	<!-- (maxValue - minValue) -->
-   <type>gauge</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>true</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g2>
-
-  <g3>
-   <name>Gauge3</name>
-   <x>270</x>
-   <y>150</y>
-   <width>100</width>
-   <height>20</height>
-   <loadfn>rudderval</loadfn>
-   <options>84</options>
-   <maxValue>+1.0</maxValue>
-   <minValue>-1.0</minValue>
-   <disp_scaling>100.0</disp_scaling>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>2.0</value_span>	<!-- (maxValue - minValue) -->
-   <type>gauge</type>
-   <tick_bottom>false</tick_bottom>
-   <tick_top>false</tick_top>
-   <tick_right>true</tick_right>
-   <tick_left>true</tick_left>
-   <cap_bottom>true</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g3>
-
-  <g4>
-   <name>Gauge4</name>
-   <x>15</x>
-   <y>165</y>
-   <width>20</width>
-   <height>150</height>
-   <loadfn>throttleval</loadfn>
-   <options>86</options>
-   <maxValue>1.0</maxValue>
-   <minValue>0.0</minValue>
-   <disp_scaling>100.0</disp_scaling>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>1.0</value_span>	<!-- (maxValue - minValue) -->
-   <type>gauge</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>true</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g4>
-
- </cards>
-
-</PropertyList>
diff --git a/Huds/Instruments/Engineering/hudladder.xml b/Huds/Instruments/Engineering/hudladder.xml
deleted file mode 100644
index ca96a9b70..000000000
--- a/Huds/Instruments/Engineering/hudladder.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<PropertyList>
-
- <ladders>
-
-  <l1>
-  <name>Pitch Ladder</name>
-  <x>260</x>
-  <y>150</y>
-  <width>120</width>
-  <height>180</height>
-  <compression_factor>2.68</compression_factor>
-  <loadfn>roll</loadfn>
-  <loadfn1>pitch</loadfn1>
-  <span_units>45.0</span_units>
-  <division_units>10.0</division_units>
-  <screen_hole>70</screen_hole>
-  <lbl_pos>0</lbl_pos>
-  <enable_frl>false</enable_frl>
-  <enable_target_spot>true</enable_target_spot>
-  <enable_velocity_vector>false</enable_velocity_vector>
-  <enable_drift_marker>false</enable_drift_marker>
-  <enable_alpha_bracket>false</enable_alpha_bracket>
-  <enable_energy_marker>false</enable_energy_marker>
-  <enable_climb_dive_marker>false</enable_climb_dive_marker>
-  <enable_glide_slope_marker>false</enable_glide_slope_marker>
-  <glide_slope>0.0</glide_slope>
-  <enable_energy_worm>false</enable_energy_worm>
-  <enable_waypoint_marker>false</enable_waypoint_marker>
-  <working>true</working>
-  </l1>
-
- </ladders>
-
-</PropertyList>
diff --git a/Huds/Instruments/Engineering/instrlabel.xml b/Huds/Instruments/Engineering/instrlabel.xml
deleted file mode 100644
index e53139378..000000000
--- a/Huds/Instruments/Engineering/instrlabel.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<PropertyList>
-
- <labels>
-
-  <i1>
-   <name>machno</name>
-   <x>25</x>
-   <y>130</y> 
-   <width>40</width>
-   <height>30</height>
-   <data_source>mach</data_source>
-   <label_format>%4.2f</label_format>
-   <pre_label_string>blank</pre_label_string>
-   <post_label_string>NULL</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>2</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-  </i1>
-
-  <lat>
-   <name>lattitude</name>
-   <x>110</x>
-   <y>430</y>
-   <width>1</width>
-   <height>10</height>
-   <data_source>latitude</data_source>
-   <label_format>%s%</label_format>
-   <pre_label_string>blank</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>1</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-   <latitude>true</latitude>
-   <longitude>false</longitude>
-  </lat>
-
-  <lon>
-   <name>longitude</name>
-   <x>530</x>
-   <y>430</y>
-   <width>1</width>
-   <height>10</height>
-   <data_source>longitude</data_source>
-   <label_format>%s%</label_format>
-   <pre_label_string>blank</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>1</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-   <latitude>false</latitude>
-   <longitude>true</longitude>
-  </lon>
-
-  <alpha>
-   <name>alpha</name>
-   <x>530</x>
-   <y>70</y>
-   <width>1</width>
-   <height>10</height>
-   <data_source>aoa</data_source>
-   <label_format>%4.1f%</label_format>
-   <pre_label_string>alpha:</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-  </alpha>
-
-  <beta>
-   <name>beta</name>
-   <x>530</x>
-   <y>55</y>
-   <width>1</width>
-   <height>10</height>
-   <data_source>sideslip</data_source>
-   <label_format>%4.1f%</label_format>
-   <pre_label_string>beta:</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-  </beta>
-  
-  <nlf>
-   <name>nlf</name>
-   <x>530</x>
-   <y>40</y>
-   <width>1</width>
-   <height>10</height>
-   <data_source>nlf</data_source>
-   <label_format>%4.1f%</label_format>
-   <pre_label_string>nlf:</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-  </nlf>
-  
-  <framerate>
-   <name>framerate</name>
-   <x>530</x>
-   <y>25</y>
-   <width>1</width>
-   <height>10</height>
-   <data_source>framerate</data_source>
-   <label_format>%5.1f%</label_format>
-   <pre_label_string>framerate:</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-   <latitude>false</latitude>
-   <longitude>false</longitude>
-  </framerate>
-
-</labels>
-
-</PropertyList>
diff --git a/Huds/Instruments/Minimal/fgtbi.xml b/Huds/Instruments/Minimal/fgtbi.xml
deleted file mode 100644
index a309996c7..000000000
--- a/Huds/Instruments/Minimal/fgtbi.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<PropertyList>
-
- <tbis>
-
-  <f1>
-  <name>fgTBI_Instrument</name>
-  <x>290</x>
-  <y>55</y>
-  <width>60</width>
-  <height>10</height>
-  <loadfn>roll</loadfn>
-  <loadfn1>sideslip</loadfn1>
-  <maxBankAngle>45.0</maxBankAngle>
-  <maxSlipAngle>5.0</maxSlipAngle>
-  <gap_width>5</gap_width>
-  <working>true</working>
-  </f1>
-
- </tbis>
-
-</PropertyList>
diff --git a/Huds/Instruments/Minimal/gload.xml b/Huds/Instruments/Minimal/gload.xml
deleted file mode 100644
index 6e17dd705..000000000
--- a/Huds/Instruments/Minimal/gload.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-<!--
-# Gload.xml file
-# Defines a control that displays gload on the HUD
-# Created by Keerti Bhamidpati (bhamidip@uiuc.edu)
-
--->
-
-<PropertyList>
-
- <labels>
-
-  <i1>
-   <name>G Load</name>
-   <x>11</x>
-   <y>294</y> 
-   <width>40</width>
-   <height>30</height>
-   <data_source>anzg</data_source>	<!-- Name of the function to be called, here get_anzg() is called -->
-   <label_format>%4.2f</label_format>	<!-- The Label Format -->
-   <pre_label_string>NULL</pre_label_string> <!-- String to be written Pre Label -->
-   <post_label_string> g</post_label_string> <!-- String to be written Post Label -->
-   <scale_data>1.0</scale_data>
-   <options>4</options>					<!-- Read Tape options or Hud.hxx -->
-   <justification>0</justification>	<!-- Justify the label, 0=LEFT_JUSTIFY, 1=CENTER_JUSTIFY, 2=RIGHT_JUSTIFY -->
-   <blinking>0</blinking>		<!-- Yet to be implemented  -->
-   <working>true</working>
-   <latitude>false</latitude>		<!-- True if the label is to display Lattitude (special label, displays deg.min.sec)-->
-   <longitude>false</longitude>     <!-- True if the label is to display Longitude (special label, displays deg.min.sec)-->
-  </i1>
-               
- </labels>
-
-</PropertyList>
diff --git a/Huds/Instruments/Minimal/hudcard.xml b/Huds/Instruments/Minimal/hudcard.xml
deleted file mode 100644
index 8b076b733..000000000
--- a/Huds/Instruments/Minimal/hudcard.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<PropertyList>
-
- <cards>
-
-  <c1>
-   <name>Gyrocompass</name>
-   <x>220</x>
-   <y>430</y>
-   <width>200</width>
-   <height>28</height>
-   <loadfn>view_direction</loadfn>
-   <options>4</options> 	<!-- HUDS_TOP -->
-   <maxValue>360.0</maxValue>
-   <minValue>0.0</minValue>
-   <disp_scaling>1.0</disp_scaling>
-   <major_divs>5</major_divs>
-   <minor_divs>1</minor_divs>
-   <modulator>360</modulator>
-   <value_span>25.0</value_span>
-   <type>tape</type>
-   <tick_bottom>false</tick_bottom>
-   <tick_top>false</tick_top>
-   <tick_right>true</tick_right>
-   <tick_left>true</tick_left>
-   <cap_bottom>true</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <tick_type>line</tick_type>
-   <tick_length>variable</tick_length>
-   <working>true</working>
-  </c1>
-
-  <g1>
-   <name>Gauge1</name>
-   <x>270</x>
-   <y>390</y>
-   <width>100</width>
-   <height>20</height>
-   <loadfn>aileronval</loadfn>
-   <options>136</options> <!-- HUDS_BOTTOM | HUDS_NOTEXT -->
-   <maxValue>+1.0</maxValue>
-   <minValue>-1.0</minValue>
-   <disp_scaling>100.0</disp_scaling>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>2.0</value_span>
-   <type>gauge</type>
-   <tick_bottom>false</tick_bottom>
-   <tick_top>false</tick_top>
-   <tick_right>true</tick_right>
-   <tick_left>true</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>true</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>false</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g1>
-
-  <g2>
-   <name>Gauge2</name>
-   <x>20</x>
-   <y>190</y>
-   <width>20</width>
-   <height>100</height>
-   <loadfn>elevatorval</loadfn>
-   <options>138</options>	<!-- HUDS_RIGHT | HUDS_VERT | HUDS_NOTEXT -->
-   <disp_scaling>-100.0</disp_scaling>
-   <maxValue>+1.0</maxValue>
-   <minValue>-1.0</minValue>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>2.0</value_span>
-   <type>gauge</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>true</cap_left>
-   <marker_offset>0.0</marker_offset>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g2>
-
-  <g3>
-   <name>Gauge3</name>
-   <x>270</x>
-   <y>25</y>
-   <width>100</width>
-   <height>20</height>
-   <loadfn>rudderval</loadfn>
-   <options>132</options> <!-- HUDS_TOP | HUDS_NOTEXT -->
-   <disp_scaling>100.0</disp_scaling>
-   <maxValue>+1.0</maxValue>
-   <minValue>-1.0</minValue>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>2.0</value_span>
-   <marker_offset>0.0</marker_offset>
-   <type>gauge</type>
-   <tick_bottom>false</tick_bottom>
-   <tick_top>false</tick_top>
-   <tick_right>true</tick_right>
-   <tick_left>true</tick_left>
-   <cap_bottom>true</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>false</cap_left>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g3>
-
-  <g4>
-   <name>Gauge4</name>
-   <x>600</x>
-   <y>160</y>
-   <width>20</width>
-   <height>160</height>
-   <loadfn>throttleval</loadfn>
-   <options>134</options> <!-- HUDS_VERT | HUDS_LEFT | HUDS_NOTEXT -->
-   <disp_scaling>100.0</disp_scaling>
-   <maxValue>1.0</maxValue>
-   <minValue>0.0</minValue>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>1.0</value_span>
-   <marker_offset>0.0</marker_offset>
-   <type>gauge</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>true</cap_right>
-   <cap_left>false</cap_left>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g4>
-
-  <g5>
-   <name>Gauge5</name>
-   <x>10</x>
-   <y>190</y>
-   <width>10</width>
-   <height>100</height>
-   <loadfn>elevatortrimval</loadfn>
-   <options>134</options>	<!-- HUDS_LEFT | HUDS_VERT | HUDS_NOTEXT -->
-   <disp_scaling>-100.0</disp_scaling>
-   <maxValue>+1.0</maxValue>
-   <minValue>-1.0</minValue>
-   <major_divs>50</major_divs>
-   <minor_divs>0</minor_divs>
-   <modulator>0</modulator>
-   <value_span>2.0</value_span>	<!-- (maxValue - minValue) -->
-   <marker_offset>0.0</marker_offset>
-   <type>gauge</type>
-   <tick_bottom>true</tick_bottom>
-   <tick_top>true</tick_top>
-   <tick_right>false</tick_right>
-   <tick_left>false</tick_left>
-   <cap_bottom>false</cap_bottom>
-   <cap_top>false</cap_top>
-   <cap_right>false</cap_right>
-   <cap_left>false</cap_left>
-   <enable_pointer>true</enable_pointer>
-   <pointer_type>fixed</pointer_type>
-   <working>true</working>
-  </g5>
-
- </cards>
-
-</PropertyList>
diff --git a/Huds/Instruments/Minimal/hudladder.xml b/Huds/Instruments/Minimal/hudladder.xml
deleted file mode 100644
index d92c9db20..000000000
--- a/Huds/Instruments/Minimal/hudladder.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<PropertyList>
-
- <ladders>
-
-  <l1>
-  <name>artificialhorizon</name>
-  <x>260</x>
-  <y>150</y>
-  <width>120</width>
-  <height>180</height>
-  <compression_factor>2.68</compression_factor>
-  <loadfn>roll</loadfn>
-  <loadfn1>pitch</loadfn1>
-  <span_units>45.0</span_units>
-  <division_units>0.0</division_units>
-  <minor_division>0.0</minor_division>
-  <screen_hole>70</screen_hole>
-  <lbl_pos>0</lbl_pos>
-  <enable_frl>false</enable_frl>
-  <enable_target_spot>true</enable_target_spot>
-  <enable_velocity_vector>false</enable_velocity_vector>
-  <enable_drift_marker>false</enable_drift_marker>
-  <enable_alpha_bracket>false</enable_alpha_bracket>
-  <enable_energy_marker>false</enable_energy_marker>
-  <enable_climb_dive_marker>false</enable_climb_dive_marker>
-  <enable_glide_slope_marker>false</enable_glide_slope_marker>
-  <glide_slope>0.0</glide_slope>
-  <enable_energy_worm>false</enable_energy_worm>
-  <enable_waypoint_marker>false</enable_waypoint_marker>
-  <working>true</working>
-  </l1>
-
- </ladders>
-
-</PropertyList>
diff --git a/Huds/Instruments/Minimal/instrlabel.xml b/Huds/Instruments/Minimal/instrlabel.xml
deleted file mode 100644
index a25e07f30..000000000
--- a/Huds/Instruments/Minimal/instrlabel.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<PropertyList>
-
- <labels>
-
-  <i1>
-   <name>Label1</name>
-   <x>40</x>
-   <y>25</y> 
-   <width>60</width>
-   <height>10</height>
-   <data_source>framerate</data_source>
-   <label_format>%7.1f</label_format>
-   <pre_label_string>Frame rate =</pre_label_string>
-   <post_label_string>NULL</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-  </i1>
-
-  <i2>
-   <name>Label2</name>
-   <x>40</x>
-   <y>40</y> 
-   <width>90</width>
-   <height>10</height>
-   <data_source>fov</data_source>
-   <label_format>%7.1f</label_format>
-   <pre_label_string>FOV          =</pre_label_string>
-   <post_label_string>NULL</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-  </i2>
-
-  <i3>
-   <name>Label3</name>
-   <x>480</x>
-   <y>70</y> 
-   <width>60</width>
-   <height>10</height>
-   <data_source>aoa</data_source>
-   <label_format>%7.2f</label_format>
-   <pre_label_string>AOA =</pre_label_string>
-   <post_label_string> Deg</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-  </i3>
-
-  <i4>
-   <name>Label4</name>
-   <x>480</x>
-   <y>55</y> 
-   <width>40</width>
-   <height>30</height>
-   <data_source>speed</data_source>
-   <label_format>%5.0f</label_format>
-   <pre_label_string>Airspeed </pre_label_string>
-   <post_label_string> Kts</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-  </i4>
-
-  <i5>
-   <name>Label5</name>
-   <x>480</x>
-   <y>40</y> 
-   <width>40</width>
-   <height>10</height>
-   <data_source>altitude</data_source>
-   <label_format>%5.0f</label_format>
-   <pre_label_string>Altitude </pre_label_string>
-   <post_label_string>units</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-  </i5>
-
-  <i6>
-   <name>Label6</name>
-   <x>480</x>
-   <y>25</y> 
-   <width>40</width>
-   <height>10</height>
-   <data_source>agl</data_source>
-   <label_format>%5.0f</label_format>
-   <pre_label_string>Elevation </pre_label_string>
-   <post_label_string>units</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-  </i6>
-
-  <i7>
-   <name>Label7</name>
-   <x>480</x>
-   <y>10</y> 
-   <width>60</width>
-   <height>10</height>
-   <data_source>heading</data_source>
-   <label_format>%5.1f</label_format>
-   <pre_label_string>Heading  </pre_label_string>
-   <post_label_string> Deg</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>0</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-  </i7>
-
-  <lat>
-   <name>lattitude</name>
-   <x>110</x>
-   <y>430</y>
-   <width>0</width>
-   <data_source>latitude</data_source>
-   <label_format>%s%</label_format>
-   <pre_label_string>blank</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>1</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-   <latitude>true</latitude>
-  </lat>
-
-  <lon>
-   <name>longitude</name>
-   <x>530</x>
-   <y>430</y>
-   <width>1</width>
-   <data_source>longitude</data_source>
-   <label_format>%s%</label_format>
-   <pre_label_string>blank</pre_label_string>
-   <post_label_string>blank</post_label_string>
-   <scale_data>1.0</scale_data>
-   <options>4</options>
-   <justification>1</justification>
-   <blinking>0</blinking>
-   <working>true</working>
-   <longitude>true</longitude>
-  </lon>
-
-</labels>
-
-</PropertyList>
diff --git a/Huds/Minimal/default.xml b/Huds/Minimal/default.xml
deleted file mode 100644
index 95d2de920..000000000
--- a/Huds/Minimal/default.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Preliminary Default Hud.
-November 2000
-Neetha Girish <neetha@ada.ernet.in>
-
-Based on Default Panel by David Megginson, david@megginson.com.
-
-This is a Hud configuration file for the open-source flight
-simulator FlightGear (www.flightgear.org).  The file is an XML-encoded
-FlightGear property list defining the Hud.
-
-Each instrument is, itself, defined in an XML-encoded property list
-in a separate file.
-
--->
-
-<PropertyList>
- <depreciated/>
-
- <name>Minimal Aircraft Hud</name>
-
- <instruments>
-
-  <hudladder>
-   <path>Huds/Instruments/Minimal/hudladder.xml</path>
-  </hudladder>
-
-  <hudcard>
-   <path>Huds/Instruments/Minimal/hudcard.xml</path>
-  </hudcard>
-
-  <instrlabel>
-   <path>Huds/Instruments/Minimal/instrlabel.xml</path>
-  </instrlabel>
-
-  <fgTBI>
-   <path>Huds/Instruments/Minimal/fgtbi.xml</path>
-  </fgTBI>
-
-  <Gload>
-   <path>Huds/Instruments/Minimal/gload.xml</path>
-  </Gload>
-
- </instruments>
-
-</PropertyList>
diff --git a/Huds/Sets/autopilot.xml b/Huds/Sets/autopilot.xml
index 512262d98..4be2ba32b 100644
--- a/Huds/Sets/autopilot.xml
+++ b/Huds/Sets/autopilot.xml
@@ -4,10 +4,26 @@
 
 	<!-- heading -->
 
+    <label>
+		<width>60</width>
+		<height>10</height>
+		<box>true</box>
+		<format>ROLL</format>
+		<halign>left</halign>
+		<condition>
+			<equals>
+				<property>/autopilot/locks/heading</property>
+				<value>wing-leveler</value>
+			</equals>
+		</condition>
+	</label>
+    
+
 	<label>
-		<width>2</width>
-		<height>2</height>
-		<format>hdg = %.1f</format>
+		<width>60</width>
+		<height>10</height>
+		<box>true</box>
+		<format>HDG %03d</format>
 		<halign>left</halign>
 		<input>
 			<property>/autopilot/settings/heading-bug-deg</property>
@@ -21,9 +37,10 @@
 	</label>
 
 	<label>
-		<width>2</width>
-		<height>2</height>
-		<format>hdg = %.1f</format>
+		<width>60</width>
+		<height>10</height>
+		<box>true</box>
+		<format>HDG %03d</format>
 		<halign>left</halign>
 		<input>
 			<property>/autopilot/settings/true-heading-deg</property>
@@ -36,217 +53,15 @@
 		</condition>
 	</label>
 
-	<!-- wp[0] -->
-
-	<label>
-		<x>0</x>
-		<y>-15</y>
-		<width>2</width>
-		<height>2</height>
-		<format>%5s</format>
-		<halign>left</halign>
-		<input>
-			<property>/autopilot/route-manager/wp[0]/id</property>
-		</input>
-		<condition>
-			<equals>
-				<property>/autopilot/locks/heading</property>
-				<value>true-heading-hold</value>
-			</equals>
-		</condition>
-	</label>
-
-	<label>
-		<x>35</x>
-		<y>-15</y>
-		<width>2</width>
-		<height>2</height>
-		<format>%6.1fnm</format>
-		<halign>left</halign>
-		<input>
-			<property>/autopilot/route-manager/wp[0]/dist</property>
-		</input>
-		<condition>
-			<equals>
-				<property>/autopilot/locks/heading</property>
-				<value>true-heading-hold</value>
-			</equals>
-			<not>
-				<equals>
-					<property>/autopilot/route-manager/wp[0]/id</property>
-					<value></value>
-				</equals>
-			</not>
-		</condition>
-	</label>
-
-	<label>
-		<x>82</x>
-		<y>-15</y>
-		<width>2</width>
-		<height>2</height>
-		<format>%s</format>
-		<halign>left</halign>
-		<input>
-			<property>/autopilot/route-manager/wp[0]/eta</property>
-		</input>
-		<condition>
-			<equals>
-				<property>/autopilot/locks/heading</property>
-				<value>true-heading-hold</value>
-			</equals>
-			<not>
-				<equals>
-					<property>/autopilot/route-manager/wp[0]/id</property>
-					<value></value>
-				</equals>
-			</not>
-		</condition>
-	</label>
-
-	<!-- wp[1] -->
-
-	<label>
-		<x>0</x>
-		<y>-30</y>
-		<width>2</width>
-		<height>2</height>
-		<format>%5s</format>
-		<halign>left</halign>
-		<input>
-			<property>/autopilot/route-manager/wp[1]/id</property>
-		</input>
-		<condition>
-			<equals>
-				<property>/autopilot/locks/heading</property>
-				<value>true-heading-hold</value>
-			</equals>
-		</condition>
-	</label>
-
-	<label>
-		<x>35</x>
-		<y>-30</y>
-		<width>2</width>
-		<height>2</height>
-		<format>%6.1fnm</format>
-		<halign>left</halign>
-		<input>
-			<property>/autopilot/route-manager/wp[1]/dist</property>
-		</input>
-		<condition>
-			<equals>
-				<property>/autopilot/locks/heading</property>
-				<value>true-heading-hold</value>
-			</equals>
-			<not>
-				<equals>
-					<property>/autopilot/route-manager/wp[1]/id</property>
-					<value></value>
-				</equals>
-			</not>
-		</condition>
-	</label>
-
-	<label>
-		<x>82</x>
-		<y>-30</y>
-		<width>2</width>
-		<height>2</height>
-		<format>%s</format>
-		<halign>left</halign>
-		<input>
-			<property>/autopilot/route-manager/wp[1]/eta</property>
-		</input>
-		<condition>
-			<equals>
-				<property>/autopilot/locks/heading</property>
-				<value>true-heading-hold</value>
-			</equals>
-			<not>
-				<equals>
-					<property>/autopilot/route-manager/wp[1]/id</property>
-					<value></value>
-				</equals>
-			</not>
-		</condition>
-	</label>
-
-	<!-- wp[2] -->
-
-	<label>
-		<x>0</x>
-		<y>-45</y>
-		<width>2</width>
-		<height>2</height>
-		<format>%5s</format>
-		<halign>left</halign>
-		<input>
-			<property>/autopilot/route-manager/wp[2]/id</property>
-		</input>
-		<condition>
-			<equals>
-				<property>/autopilot/locks/heading</property>
-				<value>true-heading-hold</value>
-			</equals>
-		</condition>
-	</label>
-
-	<label>
-		<x>35</x>
-		<y>-45</y>
-		<width>2</width>
-		<height>2</height>
-		<format>%6.1fnm</format>
-		<halign>left</halign>
-		<input>
-			<property>/autopilot/route-manager/wp[2]/dist</property>
-		</input>
-		<condition>
-			<equals>
-				<property>/autopilot/locks/heading</property>
-				<value>true-heading-hold</value>
-			</equals>
-			<not>
-				<equals>
-					<property>/autopilot/route-manager/wp[2]/id</property>
-					<value></value>
-				</equals>
-			</not>
-		</condition>
-	</label>
-
-	<label>
-		<x>82</x>
-		<y>-45</y>
-		<width>2</width>
-		<height>2</height>
-		<format>%s</format>
-		<halign>left</halign>
-		<input>
-			<property>/autopilot/route-manager/wp[2]/eta</property>
-		</input>
-		<condition>
-			<equals>
-				<property>/autopilot/locks/heading</property>
-				<value>true-heading-hold</value>
-			</equals>
-			<not>
-				<equals>
-					<property>/autopilot/route-manager/wp[2]/id</property>
-					<value></value>
-				</equals>
-			</not>
-		</condition>
-	</label>
 
 	<!-- altitude -->
 
 	<label>
-		<y>-60</y>
-		<width>2</width>
-		<height>2</height>
-		<format>alt = %.0f</format>
+		<x>60</x>
+		<width>60</width>
+		<height>10</height>
+		<box>true</box>
+		<format>ALT %04d</format>
 		<halign>left</halign>
 		<input>
 			<property>/autopilot/settings/target-altitude-ft</property>
@@ -259,12 +74,47 @@
 		</condition>
 	</label>
 
-	<label>
-		<y>-60</y>
-		<width>2</width>
-		<height>2</height>
-		<format>agl = %.0f</format>
+    <label>
+		<x>60</x>
+		<width>60</width>
+		<height>10</height>
+		<box>true</box>
+		<format>PTCH</format>
 		<halign>left</halign>
+		<condition>
+			<equals>
+				<property>/autopilot/locks/altitude</property>
+				<value>pitch-hold</value>
+			</equals>
+		</condition>
+	</label>
+    
+
+    <label>
+		<x>60</x>
+		<width>60</width>
+		<height>10</height>
+		<box>true</box>
+		<format>V/S %d</format>
+		<halign>left</halign>
+		<input>
+			<property>/autopilot/settings/vertical-speed-fpm</property>
+		</input>
+		<condition>
+			<equals>
+				<property>/autopilot/locks/altitude</property>
+				<value>vertical-speed-hold</value>
+			</equals>
+		</condition>
+	</label>
+
+	<label>
+		<x>60</x>
+		<width>60</width>
+		<height>10</height>
+		<format>AGL %04d</format>
+		<halign>left</halign>
+		<box>true</box>
 		<input>
 			<property>/autopilot/settings/target-agl-ft</property>
 		</input>
@@ -276,4 +126,59 @@
 		</condition>
 	</label>
 
+    <!-- speed -->
+    <label>
+		<x>120</x>
+		<width>60</width>
+		<height>10</height>
+		<format>IAS %3dkt</format>
+		<halign>left</halign>
+		<box>true</box>
+		<input>
+			<property>/autopilot/settings/target-speed-kt</property>
+		</input>
+		<condition>
+			<equals>
+				<property>/autopilot/locks/speed</property>
+				<value>speed-with-throttle</value>
+			</equals>
+		</condition>
+	</label>
+	
+	<label>
+		<x>120</x>
+		<width>60</width>
+		<height>10</height>
+		<format>MACH %1.2f</format>
+		<halign>left</halign>
+		<box>true</box>
+		<input>
+			<property>/autopilot/settings/target-speed-mach</property>
+		</input>
+		<condition>
+			<equals>
+				<property>/autopilot/locks/speed</property>
+				<value>mach-with-throttle</value>
+			</equals>
+		</condition>
+	</label>
+	
+	<label>
+		<x>120</x>
+		<width>60</width>
+		<height>10</height>
+		<format>PITCH %3dkt</format>
+		<halign>left</halign>
+		<box>true</box>
+		<input>
+			<property>/autopilot/settings/target-speed-mach</property>
+		</input>
+		<condition>
+			<equals>
+				<property>/autopilot/locks/speed</property>
+				<value>speed-with-pitch-trim</value>
+			</equals>
+		</condition>
+	</label>
+	
 </PropertyList>
diff --git a/Huds/Sets/gps.xml b/Huds/Sets/gps.xml
new file mode 100644
index 000000000..0e35e1b36
--- /dev/null
+++ b/Huds/Sets/gps.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+
+	<!-- GPS waypoint -->
+	
+	<label>
+		<width>2</width>
+		<height>2</height>
+		<format>GPS OBS:%5s</format>
+		<halign>left</halign>
+		<input>
+			<property>/instrumentation/gps/wp/wp[1]/ID</property>
+		</input>
+
+        <condition>
+            <equals>
+                <property>/instrumentation/gps/mode</property>
+                <value>obs</value>
+            </equals>
+        </condition>
+	</label>
+	
+	<label>
+		<width>2</width>
+		<height>2</height>
+		<x>80</x>
+		<format>(TO)</format>
+		<halign>left</halign>
+
+        <condition>
+            <and>
+                <equals>
+                    <property>/instrumentation/gps/mode</property>
+                    <value>obs</value>
+                </equals>
+                <not><property>/instrumentation/gps/from-flag</property></not>
+            </and>
+        </condition>
+	</label>
+	
+	<label>
+		<width>2</width>
+		<height>2</height>
+		<x>80</x>
+		<format>(FROM)</format>
+		<halign>left</halign>
+
+        <condition>
+            <and>
+                <equals>
+                    <property>/instrumentation/gps/mode</property>
+                    <value>obs</value>
+                </equals>
+                <property>/instrumentation/gps/from-flag</property>
+            </and>
+        </condition>
+	</label>
+	
+	<label>
+		<width>2</width>
+		<height>2</height>
+		<format>GPS DTO:%5s</format>
+		<halign>left</halign>
+		<input>
+			<property>/instrumentation/gps/wp/wp[1]/ID</property>
+		</input>
+
+        <condition>
+            <equals>
+                <property>/instrumentation/gps/mode</property>
+                <value>dto</value>
+            </equals>
+        </condition>
+	</label>
+	
+	<label>
+		<width>2</width>
+		<height>2</height>
+		<format>GPS LEG:%5s</format>
+		<halign>left</halign>
+		<input>
+			<property>/instrumentation/gps/wp/wp[0]/ID</property>
+		</input>
+
+        <condition>
+            <equals>
+                <property>/instrumentation/gps/mode</property>
+                <value>leg</value>
+            </equals>
+        </condition>
+
+	</label>
+	
+	<label>
+		<width>2</width>
+		<height>2</height>
+		<x>80</x>
+		<format>-&gt;%5s</format>
+		<halign>left</halign>
+		<input>
+			<property>/instrumentation/gps/wp/wp[1]/ID</property>
+		</input>
+
+        <condition>
+            <equals>
+                <property>/instrumentation/gps/mode</property>
+                <value>leg</value>
+            </equals>
+        </condition>
+
+	</label>
+	
+	
+	
+	<label>
+		<width>2</width>
+		<height>2</height>
+		<y>-10</y>
+		<format>D: %4.1fnm</format>
+		<halign>left</halign>
+		<input>
+			<property>/instrumentation/gps/wp/wp[1]/distance-nm</property>
+		</input>
+	</label>
+	
+	<label>
+		<width>2</width>
+		<height>2</height>
+		<x>60</x>
+		<y>-10</y>
+		<format>TTW:%s</format>
+		<halign>left</halign>
+		<input>
+			<property>/instrumentation/gps/wp/wp[1]/TTW</property>
+		</input>
+	</label>
+	
+	<label>
+		<width>2</width>
+		<height>2</height>
+		<y>-20</y>
+		<format>BRG:%03d</format>
+		<halign>left</halign>
+		<input>
+			<property>/instrumentation/gps/wp/wp[1]/bearing-mag-deg</property>
+		</input>
+	</label>
+	
+	<label>
+		<width>2</width>
+		<height>2</height>
+		<y>-20</y>
+		<x>60</x>
+		<format>XTK: %2.1fnm</format>
+		<halign>left</halign>
+		<input>
+			<property>/instrumentation/gps/wp/wp[1]/course-error-nm</property>
+		</input>
+		
+		<condition>
+    		<greater-than>
+    		    <expression>
+    		        <abs><property>/instrumentation/gps/wp/wp[1]/course-error-nm</property></abs>
+    		    </expression>
+    		    <value>0.1</value>
+    		</greater-than>
+    	</condition>
+	</label>
+	
+    <label>
+		<width>2</width>
+		<height>2</height>
+		<y>-30</y>
+		<format>GS:%3dkts</format>
+		<halign>left</halign>
+		<input>
+			<property>/instrumentation/gps/indicated-ground-speed-kt</property>
+		</input>
+	</label>
+</PropertyList>
+	
\ No newline at end of file
diff --git a/Huds/default.xml b/Huds/default.xml
index 2c3201920..9643f2495 100644
--- a/Huds/default.xml
+++ b/Huds/default.xml
@@ -29,7 +29,13 @@
 
 	<import>
 		<path>Huds/Sets/autopilot.xml</path>
-		<x-offset>-280</x-offset>
+		<x-offset>-100</x-offset>
+		<y-offset>160</y-offset>
+	</import>
+
+    <import>
+		<path>Huds/Sets/gps.xml</path>
+		<x-offset>-300</x-offset>
 		<y-offset>160</y-offset>
 	</import>