From fe20f45e19f2c51453b6ee8a833bf1c4e34b4721 Mon Sep 17 00:00:00 2001
From: merspieler <merspieler@airmail.cc>
Date: Mon, 21 Oct 2019 12:02:47 +0000
Subject: [PATCH 1/5] Fixed OVHD Fire indications

Signed-off-by: merspieler <merspieler@airmail.cc>
---
 Models/Instruments/OHpanel/OHpanel.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index eb955481..e87905a1 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -6449,7 +6449,7 @@
 	
 	<animation>
 		<type>material</type>
-		<object-name>firebtn1</object-name>
+		<object-name>Eng1FireBtn</object-name>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>
@@ -6693,7 +6693,7 @@
 	
 	<animation>
 		<type>material</type>
-		<object-name>firebtnapu</object-name>
+		<object-name>APUFireBtn</object-name>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>
@@ -6835,7 +6835,7 @@
 	
 	<animation>
 		<type>material</type>
-		<object-name>firebtn2</object-name>
+		<object-name>Eng2FireBtn</object-name>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>
@@ -7282,4 +7282,4 @@
 		</axis>
 	</animation>
 	
-</PropertyList>
\ No newline at end of file
+</PropertyList>

From 97050a5a2bfb0398575a8647b7f1263ffa190642 Mon Sep 17 00:00:00 2001
From: Semir Gebran <semgeb@wp.pl>
Date: Tue, 22 Oct 2019 21:55:40 +0200
Subject: [PATCH 2/5] Fixed ENG and APU FIRE button behaviour bug when
 performing fire and annunciator tests

---
 Models/FlightDeck/a320.flightdeck.xml         | 412 ++++++------
 Models/Instruments/OHpanel/OHpanel.xml        | 585 +++++++++---------
 .../Instruments/Pedestal_up/Pedestal_up.xml   | 101 ++-
 3 files changed, 553 insertions(+), 545 deletions(-)

diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 7c0665fa..01db06e0 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -5,7 +5,7 @@
 <PropertyList>
 
 	<path>res/fd_complete.ac</path>
-	
+
 	<animation>
 		<type>translate</type>
 		<property>systems/shake/shaking</property>
@@ -18,7 +18,7 @@
 			<z2-m> 0.8</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>hud</object-name>
@@ -67,7 +67,7 @@
 			<pitch-deg>69.547</pitch-deg>
 		</offsets>
 	</model-->
-	
+
 	<model>
 		<path>Aircraft/A320-family/Models/Instruments/OHpanel/OHpanel.xml</path>
 		<offsets>
@@ -77,7 +77,7 @@
 			<pitch-deg>69.547</pitch-deg>
 		</offsets>
 	</model>
-	
+
 	<model>
 		<path>Aircraft/A320-family/Models/Instruments/OHpanel/OHpanelEPR.xml</path>
 		<condition>
@@ -93,7 +93,7 @@
 			<pitch-deg>69.547</pitch-deg>
 		</offsets>
 	</model>
-	
+
 	<model>
 		<path>Aircraft/A320-family/Models/Instruments/OHpanel/SteepAppr.xml</path>
 		<condition>
@@ -234,7 +234,7 @@
 			<z>0</z>
 		</axis>
 	</animation>
-	
+
 	<model>
 		<name>PFD2</name>
 		<path>Aircraft/A320-family/Models/Instruments/PFD/PFD2.xml</path>
@@ -245,7 +245,7 @@
 			<pitch-deg>-16.534</pitch-deg>
 		</offsets>
 	</model>
-	
+
 	<animation>
 		<type>translate</type>
 		<object-name>PFD2</object-name>
@@ -269,7 +269,7 @@
 			<pitch-deg>-16.534</pitch-deg>
 		</offsets>
 	</model>
-	
+
 	<animation>
 		<type>translate</type>
 		<object-name>ND1</object-name>
@@ -281,7 +281,7 @@
 			<z>0</z>
 		</axis>
 	</animation>
-	
+
 	<model>
 		<name>ND2</name>
 		<path>Aircraft/A320-family/Models/Instruments/ND/ND_R.xml</path>
@@ -292,7 +292,7 @@
 			<pitch-deg>-16.534</pitch-deg>
 		</offsets>
 	</model>
-	
+
 	<animation>
 		<type>translate</type>
 		<object-name>ND2</object-name>
@@ -306,7 +306,7 @@
 	</animation>
 
 	<!-- Upper ECAM -->
-	
+
 	<model>
 		<name>UECAM</name>
 		<path>Aircraft/A320-family/Models/Instruments/Upper-ECAM/Upper-ECAM.xml</path>
@@ -329,13 +329,13 @@
 			<pitch-deg>-16.534</pitch-deg>
 		</offsets>
 	</model>
-	
+
 	<!-- Standby Indicator -->
 	<model>
 		<name>IESI</name>
 		<path>Aircraft/A320-family/Models/Instruments/IESI/IESI.xml</path>
 	</model>
-	
+
 	<!-- No button lights without power! -->
 	<animation>
 		<type>select</type>
@@ -444,7 +444,7 @@
 			</greater-than-equals>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>atc-code</object-name>
@@ -457,7 +457,7 @@
 			</not>
 		</condition>
 	</animation>
-	
+
 	<!-- Not Yet Implemented Lights -->
 	<!-- Remove from this animation once you simulate -->
 	<animation>
@@ -477,8 +477,6 @@
 		<object-name>ecam_sts_led</object-name>
 		<object-name>engine_fault_1</object-name>
 		<object-name>engine_fault_2</object-name>
-		<object-name>engine_fire_1</object-name>
-		<object-name>engine_fire_2</object-name>
 		<object-name>exped_led</object-name>
 		<object-name>hdg-text-test</object-name>
 		<object-name>qnh-test</object-name>
@@ -495,7 +493,7 @@
 			</equals>
 		</condition>
 	</animation>
-	
+
 	<!-- Aft Pedestal -->
 	<animation>
 		<type>pick</type>
@@ -563,7 +561,7 @@
 			<object-name>RudderTrim.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>RudderTrimReset</object-name>
@@ -584,7 +582,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<text>
 		<name>rudder-trim</name>
 		<offsets>
@@ -610,7 +608,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<text>
 		<name>rudder-trim-test</name>
 		<offsets>
@@ -636,7 +634,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>rudder-trim</object-name>
@@ -647,7 +645,7 @@
 			</not-equals>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>ParkBrk</object-name>
@@ -657,7 +655,7 @@
 			<object-name>ParkBrk.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ParkBrk</object-name>
@@ -670,7 +668,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<!-- Autobrakes -->
 	<animation>
 		<type>select</type>
@@ -694,7 +692,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>dec_med_on</object-name>
@@ -717,7 +715,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>dec_max_on</object-name>
@@ -740,7 +738,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>abs_low_on</object-name>
@@ -757,7 +755,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>abs_med_on</object-name>
@@ -774,7 +772,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>abs_max_on</object-name>
@@ -791,7 +789,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>abs_low</object-name>
@@ -818,7 +816,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>abs_med</object-name>
@@ -845,7 +843,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>abs_max</object-name>
@@ -872,7 +870,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>land_sw</object-name>
@@ -892,7 +890,7 @@
 			<z-m>0.253933</z-m>
 		</center>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>land_sw</object-name>
@@ -953,7 +951,7 @@
 			<object-name>pfd_brt_cpt.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>pfd_nd_xfr_sw</object-name>
@@ -971,7 +969,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>brightness_nd_2_cpt</object-name>
@@ -1012,8 +1010,8 @@
 			<object-name>brightness_nd_cpt.axis</object-name>
 		</axis>
 	</animation>
-	
-	<!-- Dimmer Panel Right -->	
+
+	<!-- Dimmer Panel Right -->
 	<animation>
 		<type>pick</type>
 		<object-name>brightness_nd_2_fo</object-name>
@@ -1054,7 +1052,7 @@
 			<object-name>brightness_nd_fo.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>pfd_nd_xfr_sw2</object-name>
@@ -1072,7 +1070,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>pfd_brt_fo</object-name>
@@ -1113,7 +1111,7 @@
 			<object-name>pfd_brt_fo.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<!-- ECAM Controls -->
 	<animation>
 		<type>pick</type>
@@ -1155,7 +1153,7 @@
 			<object-name>ecam_brt_upper.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_brt_lower</object-name>
@@ -1196,7 +1194,7 @@
 			<object-name>ecam_brt_lower.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_sts</object-name>
@@ -1215,7 +1213,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_apu</object-name>
@@ -1234,7 +1232,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_bleed</object-name>
@@ -1253,7 +1251,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_press</object-name>
@@ -1272,7 +1270,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_elec</object-name>
@@ -1291,7 +1289,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_hyd</object-name>
@@ -1310,7 +1308,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_fuel</object-name>
@@ -1329,7 +1327,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_eng</object-name>
@@ -1348,7 +1346,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_cond</object-name>
@@ -1367,7 +1365,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_door</object-name>
@@ -1386,7 +1384,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_wheel</object-name>
@@ -1405,7 +1403,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_fctl</object-name>
@@ -1424,7 +1422,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_to_config</object-name>
@@ -1631,7 +1629,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ecam_clr_l_led</object-name>
@@ -1668,7 +1666,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ecam_clr_l</object-name>
@@ -1688,7 +1686,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<!-- Engine Cutoff/Mode Selector -->
 	<animation>
 		<type>pick</type>
@@ -1702,7 +1700,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>Lcutoff</object-name>
@@ -1715,7 +1713,7 @@
 			<object-name>Lcutoff.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>Rcutoff</object-name>
@@ -1728,7 +1726,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>Rcutoff</object-name>
@@ -1741,7 +1739,7 @@
 			<object-name>Rcutoff.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>eng_mode</object-name>
@@ -1771,7 +1769,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>eng_mode</object-name>
@@ -1786,7 +1784,7 @@
 			<object-name>eng_mode.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<!-- FCU QNH and PFD Controls/Lights -->
 	<animation>
 		<type>pick</type>
@@ -1922,7 +1920,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>qnh_cpt_sw</object-name>
@@ -1941,7 +1939,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>qnh_cpt_knb</object-name>
@@ -1951,7 +1949,7 @@
 			<object-name>qnh_cpt_knb.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>qnh_fo_knb</object-name>
@@ -1961,7 +1959,7 @@
 			<object-name>qnh_fo_knb.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>qnh_cpt_sw</object-name>
@@ -1974,7 +1972,7 @@
 			<object-name>qnh_cpt_sw.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>qnh_fo_sw</object-name>
@@ -1987,7 +1985,7 @@
 			<object-name>qnh_fo_sw.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<text>
 		<name>qnh-inhg</name>
 		<offsets>
@@ -2143,7 +2141,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<text>
 		<name>qnh-test</name>
 		<offsets>
@@ -2169,7 +2167,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<text>
 		<name>qnh-test</name>
 		<offsets>
@@ -2195,7 +2193,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>qnh-inhg</object-name>
@@ -2254,7 +2252,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>fd1</object-name>
@@ -2286,7 +2284,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ils</object-name>
@@ -2321,7 +2319,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ils2</object-name>
@@ -2356,7 +2354,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>fd2</object-name>
@@ -2388,7 +2386,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- FCU ND Controls -->
 	<animation>
 		<type>pick</type>
@@ -2431,7 +2429,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>cstr.001</object-name>
@@ -2473,7 +2471,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>wpt</object-name>
@@ -2515,7 +2513,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>wpt.001</object-name>
@@ -2557,7 +2555,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>vord</object-name>
@@ -2599,7 +2597,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>vord.001</object-name>
@@ -2641,7 +2639,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ndb</object-name>
@@ -2683,7 +2681,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ndb.001</object-name>
@@ -2725,7 +2723,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>arpt</object-name>
@@ -2767,7 +2765,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>arpt.001</object-name>
@@ -2809,7 +2807,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>nd_mode</object-name>
@@ -2847,7 +2845,7 @@
 			<object-name>nd_mode.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>nd_mode_fo</object-name>
@@ -2885,7 +2883,7 @@
 			<object-name>nd_mode_fo.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>nd_range</object-name>
@@ -2924,7 +2922,7 @@
 			<object-name>nd_range.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>nd_range_fo</object-name>
@@ -2963,7 +2961,7 @@
 			<object-name>nd_range_fo.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>vor-adf-1</object-name>
@@ -3003,7 +3001,7 @@
 			<object-name>vor-adf-1.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>vor-adf-1-right</object-name>
@@ -3043,7 +3041,7 @@
 			<object-name>vor-adf-1-right.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>vor-adf-2</object-name>
@@ -3083,7 +3081,7 @@
 			<object-name>vor-adf-2.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>vor-adf-2-right</object-name>
@@ -3123,7 +3121,7 @@
 			<object-name>vor-adf-2-right.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<!-- FCU AP Controls/Lights -->
 	<animation>
 		<type>select</type>
@@ -3141,7 +3139,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>mach.ind</object-name>
@@ -3158,7 +3156,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>spd-text</object-name>
@@ -3179,7 +3177,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>mach-text</object-name>
@@ -3200,7 +3198,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>spd.fmgc</object-name>
@@ -3211,7 +3209,7 @@
 			</equals>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>spd.dash</object-name>
@@ -3228,7 +3226,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>hdg.ind</object-name>
@@ -3246,7 +3244,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>trk.ind</object-name>
@@ -3264,7 +3262,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>hdg-text</object-name>
@@ -3281,7 +3279,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>lat.fmgc</object-name>
@@ -3298,7 +3296,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>lat.dash</object-name>
@@ -3319,7 +3317,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>lvlch.ind</object-name>
@@ -3336,7 +3334,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>alt-text</object-name>
@@ -3347,7 +3345,7 @@
 			</not-equals>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>vs.dash</object-name>
@@ -3364,7 +3362,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>vs.ind</object-name>
@@ -3382,7 +3380,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>fpa.ind</object-name>
@@ -3400,7 +3398,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>vs-text</object-name>
@@ -3417,7 +3415,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>fpa-text</object-name>
@@ -3434,7 +3432,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>vs.dash</object-name>
@@ -3455,7 +3453,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<text>
 		<name>spd-text</name>
 		<offsets>
@@ -3507,7 +3505,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<text>
 		<name>spd-text-test</name>
 		<offsets>
@@ -3559,7 +3557,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<text>
 		<name>hdg-text-test</name>
 		<offsets>
@@ -3590,7 +3588,7 @@
 		<name>alt-text</name>
 		<offsets>
 			<x-m>-0.377</x-m>
-			<y-m>0.0432</y-m> 
+			<y-m>0.0432</y-m>
 			<z-m>0.50254</z-m>
 			<heading-deg>90</heading-deg>
 			<roll-deg>72.81</roll-deg>
@@ -3611,12 +3609,12 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<text>
 		<name>alt-text-test</name>
 		<offsets>
 			<x-m>-0.377</x-m>
-			<y-m>0.0432</y-m> 
+			<y-m>0.0432</y-m>
 			<z-m>0.50254</z-m>
 			<heading-deg>90</heading-deg>
 			<roll-deg>72.81</roll-deg>
@@ -3689,7 +3687,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<text>
 		<name>vs-text-test</name>
 		<offsets>
@@ -3715,7 +3713,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>hdg-sel</object-name>
@@ -3725,7 +3723,7 @@
 			<object-name>hdg-sel.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>spd-sel</object-name>
@@ -3735,7 +3733,7 @@
 			<object-name>spd-sel.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>alt-sel</object-name>
@@ -3745,7 +3743,7 @@
 			<object-name>alt-sel.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>vs-sel</object-name>
@@ -3755,7 +3753,7 @@
 			<object-name>vs-sel.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>alt-sel-mode</object-name>
@@ -3768,7 +3766,7 @@
 			<object-name>alt-sel.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>spd-mach</object-name>
@@ -3785,7 +3783,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>spd-sel</object-name>
@@ -3876,7 +3874,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>hdg-sel</object-name>
@@ -3967,7 +3965,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>loc</object-name>
@@ -4020,7 +4018,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>hdg-vs</object-name>
@@ -4037,7 +4035,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ap1</object-name>
@@ -4069,7 +4067,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ap2</object-name>
@@ -4101,7 +4099,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>a-thr</object-name>
@@ -4133,7 +4131,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>alt-sel</object-name>
@@ -4224,7 +4222,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>alt-sel-mode</object-name>
@@ -4241,7 +4239,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>vs-sel</object-name>
@@ -4332,7 +4330,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>appr</object-name>
@@ -4373,7 +4371,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Flap Lever -->
 	<animation>
 		<type>pick</type>
@@ -4402,7 +4400,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>FlapsLever</object-name>
@@ -4413,7 +4411,7 @@
 			<entry><ind>2</ind><dep>28</dep></entry>
 			<entry><ind>3</ind><dep>42</dep></entry>
 			<entry><ind>4</ind><dep>56</dep></entry>
-		</interpolation> 
+		</interpolation>
 		<center>
 			<x-m>-0.0020</x-m>
 			<y-m>0</y-m>
@@ -4423,7 +4421,7 @@
 			<object-name>FlapsLever.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<!-- Foot Rest -->
 	<animation>
 		<name>Footrest captain pick</name>
@@ -4452,7 +4450,7 @@
          <object-name>footrest_cpt.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<name>Footrest captain pick 2</name>
 		<type>pick</type>
@@ -4508,7 +4506,7 @@
          <object-name>footrest_fo.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<name>Footrest first officer pick 2</name>
 		<type>pick</type>
@@ -4536,7 +4534,7 @@
          <object-name>footrest_fo.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<!-- Landing Gear Lever -->
 	<animation>
 		<type>rotate</type>
@@ -4584,7 +4582,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Landing Gear Lights -->
 	<animation>
 		<type>select</type>
@@ -4608,7 +4606,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>lgear_down</object-name>
@@ -4648,7 +4646,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ngear_down</object-name>
@@ -4665,7 +4663,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>rgear_unlk</object-name>
@@ -4688,7 +4686,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>rgear_down</object-name>
@@ -4705,7 +4703,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Lighting -->
 	<animation>
 		<type>pick</type>
@@ -4746,7 +4744,7 @@
 			<object-name>flood_lt_main.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>flood_lt_ped</object-name>
@@ -4786,7 +4784,7 @@
 			<object-name>flood_lt_ped.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>integ_lt</object-name>
@@ -4826,7 +4824,7 @@
 			<object-name>integ_lt.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>fcu_integ_knb</object-name>
@@ -4948,7 +4946,7 @@
 			<factor-prop>controls/lighting/main-panel-norm</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<animation>
 		<name>Panel lighting (dome)</name>
 		<type>material</type>
@@ -5049,7 +5047,7 @@
 			<factor-prop>sim/model/lights/dome-light</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<animation>
 		<name>FCU Panel lighting</name>
 		<type>material</type>
@@ -5082,7 +5080,7 @@
 			<factor-prop>controls/lighting/fcu-panel-norm</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<animation>
 		<name>FCU Panel lighting (dome)</name>
 		<type>material</type>
@@ -5115,7 +5113,7 @@
 			<factor-prop>sim/model/lights/dome-light</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<!-- Master Warning and Caution -->
 	<animation>
 		<type>select</type>
@@ -5133,7 +5131,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>master_caution_on</object-name>
@@ -5150,7 +5148,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>master_warning</object-name>
@@ -5199,7 +5197,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>master_caution</object-name>
@@ -5261,7 +5259,7 @@
 			<factor-prop>controls/lighting/overhead-panel-norm</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<animation>
 		<name>Overhead Panel-2 lighting (dome)</name>
 		<type>material</type>
@@ -5314,7 +5312,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>trim_2_lts</object-name>
@@ -5325,7 +5323,7 @@
 			<object-name>trim.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>trim_1</object-name>
@@ -5335,7 +5333,7 @@
 			<object-name>trim.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<!-- Rudder Pedals -->
 	<animation>
 		<type>translate</type>
@@ -5398,7 +5396,7 @@
 			<z-m>-0.42417</z-m>
 		</center>
 	</animation>
-	
+
 	<!-- Spoiler Lever -->
 	<animation>
 		<type>pick</type>
@@ -5485,7 +5483,7 @@
 			<z>0</z>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>translate</type>
 		<object-name>SpdBrk</object-name>
@@ -5497,7 +5495,7 @@
 			<z>1</z>
 		</axis>
 	</animation>
-	
+
 	<!-- Sidestick Left -->
 	<animation>
 		<type>rotate</type>
@@ -5684,7 +5682,7 @@
 			<object-name>sidestick_2.x.axis</object-name>
 		</axis>
 	</animation-->
-	
+
 	<!-- Tiller -->
 	<animation>
 		<type>pick</type>
@@ -5745,7 +5743,7 @@
 			<object-name>tillerFo.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<!-- Throttles -->
 	<animation>
 		<name>Engine 1 throttle lever pick</name>
@@ -5794,7 +5792,7 @@
 			<entry><ind>0.94999</ind><dep>43</dep></entry>
 			<entry><ind>0.95000</ind><dep>45</dep></entry>
 			<entry><ind>1.00000</ind><dep>45</dep></entry>
-		</interpolation> 
+		</interpolation>
 		<axis>
 			<object-name>trim.axis</object-name>
 		</axis>
@@ -5804,7 +5802,7 @@
 		<type>rotate</type>
 		<object-name>thr_l</object-name>
 		<property>fdm/jsbsim/fcs/reverse-lever[0]</property>
-		<factor>-3.5</factor> 
+		<factor>-3.5</factor>
 		<axis>
 			<object-name>trim.axis</object-name>
 		</axis>
@@ -5817,7 +5815,7 @@
 		<interpolation>
 			<entry><ind>0.00</ind><dep>  0</dep></entry>
 			<entry><ind>0.50</ind><dep>-20</dep></entry>
-		</interpolation> 
+		</interpolation>
 		<axis>
 			<object-name>trim.axis</object-name>
 		</axis>
@@ -5869,7 +5867,7 @@
 			<entry><ind>0.94999</ind><dep>43</dep></entry>
 			<entry><ind>0.95000</ind><dep>45</dep></entry>
 			<entry><ind>1.00000</ind><dep>45</dep></entry>
-		</interpolation> 
+		</interpolation>
 		<axis>
 			<object-name>trim.axis</object-name>
 		</axis>
@@ -5879,7 +5877,7 @@
 		<type>rotate</type>
 		<object-name>thr_r</object-name>
 		<property>fdm/jsbsim/fcs/reverse-lever[1]</property>
-		<factor>-3.5</factor> 
+		<factor>-3.5</factor>
 		<axis>
 			<object-name>trim.axis</object-name>
 		</axis>
@@ -5892,12 +5890,12 @@
 		<interpolation>
 			<entry><ind>0.00</ind><dep> 0</dep></entry>
 			<entry><ind>0.50</ind><dep>-20</dep></entry>
-		</interpolation> 
+		</interpolation>
 		<axis>
 			<object-name>trim.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<name>Reverse Thrust left lever</name>
 		<type>rotate</type>
@@ -5919,7 +5917,7 @@
 			<object-name>rev_r.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<!-- Tray Tables -->
 	<animation>
 		<type>translate</type>
@@ -5940,7 +5938,7 @@
 			<z2-m>-0.04488</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>tray1-cpt</object-name>
@@ -5954,7 +5952,7 @@
 			<object-name>tray1-cpt.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>tray2-cpt</object-name>
@@ -5967,7 +5965,7 @@
 			<object-name>tray2-cpt.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>translate</type>
 		<object-name>tray0-fo</object-name>
@@ -5987,7 +5985,7 @@
 			<z2-m>-0.04488</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>tray1-fo</object-name>
@@ -6001,7 +5999,7 @@
 			<object-name>tray1-fo.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>tray2-fo</object-name>
@@ -6014,7 +6012,7 @@
 			<object-name>tray2-fo.axis</object-name>
 		</axis>
 	</animation>
-	
+
 	 <animation>
         <type>pick</type>
 		<object-name>tray0-cpt</object-name>
@@ -6028,7 +6026,7 @@
 			</binding>
 		</action>
     </animation>
-	
+
 	<animation>
         <type>pick</type>
 		<object-name>tray0-fo</object-name>
@@ -6042,7 +6040,7 @@
 			</binding>
 		</action>
     </animation>
-	
+
 	<!-- Z Colors/Effects -->
 	<animation>
 		<type>material</type>
@@ -6085,7 +6083,7 @@
 			<blue>0.08</blue>
 		</emission>
 	</animation>
-	
+
 	<animation>
 		<name>Panel lighting</name>
 		<type>material</type>
@@ -6176,79 +6174,79 @@
 			<factor-prop>sim/model/lights/dome-light</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/panel-flood</inherits-from>
 		<object-name>main_panel</object-name>
 		<object-name>gear_lever_body</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/gear-lever</inherits-from>
 		<object-name>gear_lever</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/panel-flood-brightness</inherits-from>
 		<object-name>brightness_panel_left_glare</object-name>
 		<object-name>brightness_panel_right_glare</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-flood</inherits-from>
 		<object-name>pedestal_low</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-flood-glare</inherits-from>
 		<object-name>pedestal_low_glare</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/thr-quad-flood</inherits-from>
 		<object-name>thr_quad</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/rudder-trim</inherits-from>
 		<object-name>RudderTrim</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/park-brk</inherits-from>
 		<object-name>ParkBrk</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/gravity-gear</inherits-from>
 		<object-name>gravity_gear</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/panel-flood-glare</inherits-from>
 		<object-name>main_panel_signboard</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/panel-flood-glare-right</inherits-from>
 		<object-name>gear_labels</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-footrest</inherits-from>
 		<object-name>ped_footrest</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-flood-flap</inherits-from>
 		<object-name>FlapsLever</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-flood-spdbrk</inherits-from>
 		<object-name>SpdBrk</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/iesi</inherits-from>
 		<object-name>iesi</object-name>
@@ -6259,19 +6257,19 @@
 		<object-name>iesi_btn_plus</object-name>
 		<object-name>iesi_btn_rst</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/clock</inherits-from>
 		<object-name>clock</object-name>
 		<object-name>clock.001</object-name>
 		<object-name>clock_body</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/clock-glare</inherits-from>
 		<object-name>clock_glare</object-name>
 	</effect>
-	
+
 	<!-- move any objects requiring lightmap to another effect file -->
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/cockpit-irradiance</inherits-from>
@@ -6516,7 +6514,7 @@
 		<object-name>WindowOpenerFo</object-name>
 		<object-name>WX</object-name>
 	</effect>
-   
+
 	<animation>
 		<name>Panel lighting</name>
 		<type>material</type>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index e87905a1..6fe58047 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -7,7 +7,7 @@
 	<path>res/ohpanel.ac</path>
 
 	<!-- ANIMATIONS -->
-	
+
 	<!-- No button lights without power! -->
 	<animation>
 		<type>select</type>
@@ -73,7 +73,7 @@
 			</greater-than-equals>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>AftCargoIsoBtn1F</object-name>
@@ -168,7 +168,7 @@
 			</greater-than-equals>
 		</condition>
 	</animation>
-	
+
 	<!-- These are not simulated yet, so they only illuminate when the test is on. Remove each light/button once you add its select animation. -JD -->
 	<animation>
 		<type>select</type>
@@ -192,7 +192,7 @@
 			</equals>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>material</type>
 		<object-name>Battery-volt</object-name>
@@ -208,7 +208,7 @@
 			<blue>1</blue>
 		</diffuse>
 	</animation>
-	
+
 	<!-- Ventilation -->
 	<animation>
 		<type>select</type>
@@ -226,7 +226,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Cargo Smoke -->
 	<animation>
 		<type>select</type>
@@ -244,7 +244,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>AftCargoSmkBtn1S</object-name>
@@ -261,7 +261,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>FwdCargoSmkBtn2D</object-name>
@@ -282,7 +282,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>AftCargoSmkBtn2D</object-name>
@@ -303,7 +303,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>Cargo Smoke Test</name>
 		<type>pick</type>
@@ -341,7 +341,7 @@
 			</mod-up>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>FwdCargoDischBtn</object-name>
@@ -389,7 +389,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>AftCargoDischBtn</object-name>
@@ -437,7 +437,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>FwdCargoDischGuard</object-name>
@@ -459,7 +459,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>AftCargoDischGuard</object-name>
@@ -481,7 +481,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>FwdCargoDischGuard</object-name>
@@ -496,7 +496,7 @@
 			<z2-m>-0.11153</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>AftCargoDischGuard</object-name>
@@ -511,7 +511,7 @@
 			<z2-m>-0.11153</z2-m>
 		</axis>
 	</animation>
-	
+
 	<!-- IRS 1 -->
 	<animation>
 		<type>pick</type>
@@ -549,7 +549,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>IR1ModeKnb</object-name>
@@ -568,7 +568,7 @@
 			<z2-m>0.17819</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>IR1Btn1F</object-name>
@@ -601,7 +601,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- IRS 2 -->
 	<animation>
 		<type>pick</type>
@@ -639,7 +639,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>IR2ModeKnb</object-name>
@@ -658,7 +658,7 @@
 			<z2-m>0.17819</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>IR2Btn1F</object-name>
@@ -729,7 +729,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>IR3ModeKnb</object-name>
@@ -748,7 +748,7 @@
 			<z2-m>0.17819</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>IR3Btn1F</object-name>
@@ -781,7 +781,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- On Bat Light -->
 	<animation>
 		<type>select</type>
@@ -801,7 +801,7 @@
 	</animation>
 
 	<!-- ADR 1 -->
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ADR1Btn1</object-name>
@@ -827,7 +827,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ADR1Btn1F</object-name>
@@ -862,7 +862,7 @@
 	</animation>
 
 	<!-- ADR 2 -->
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ADR2Btn1</object-name>
@@ -888,7 +888,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ADR2Btn1F</object-name>
@@ -921,9 +921,9 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- ADR 3 -->
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>ADR3Btn1</object-name>
@@ -949,7 +949,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ADR3Btn1F</object-name>
@@ -1009,7 +1009,7 @@
 			<factor-prop>controls/lighting/overhead-panel-norm</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<animation>
 		<name>Panel lighting</name>
 		<type>material</type>
@@ -1035,7 +1035,7 @@
 			<factor-prop>sim/model/lights/dome-light</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<animation>
 		<name>Panel lighting</name>
 		<type>material</type>
@@ -1047,7 +1047,7 @@
 			<factor-prop>sim/model/lights/dome-light</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<animation>
 		<name>Panel lighting</name>
 		<type>material</type>
@@ -1112,7 +1112,7 @@
 			<factor-prop>sim/model/lights/dome-light</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/cockpit-irradiance</inherits-from>
 		<object-name>Panel</object-name>
@@ -1155,7 +1155,7 @@
 		<object-name>Eng2ManStartProt</object-name>
 		<object-name>EmerCallProt</object-name>
 	</effect>
-	
+
 	<!-- ELAC 1 -->
 	<animation>
 		<type>pick</type>
@@ -1182,7 +1182,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ELAC1Btn1F</object-name>
@@ -1201,7 +1201,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ELAC1Btn2O</object-name>
@@ -1218,7 +1218,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- SEC 1 -->
 	<animation>
 		<type>pick</type>
@@ -1245,7 +1245,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>SEC1Btn1F</object-name>
@@ -1268,7 +1268,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>SEC1Btn2O</object-name>
@@ -1285,7 +1285,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- FAC 1 -->
 	<animation>
 		<type>pick</type>
@@ -1312,7 +1312,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>FAC1Btn1F</object-name>
@@ -1335,7 +1335,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>FAC1Btn2O</object-name>
@@ -1352,7 +1352,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- ELAC 2 -->
 	<animation>
 		<type>pick</type>
@@ -1379,7 +1379,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ELAC2Btn1F</object-name>
@@ -1402,7 +1402,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ELAC2Btn2O</object-name>
@@ -1419,7 +1419,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- SEC 3 -->
 	<animation>
 		<type>pick</type>
@@ -1446,7 +1446,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>SEC2Btn1F</object-name>
@@ -1469,7 +1469,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>SEC2Btn2O</object-name>
@@ -1486,7 +1486,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- SEC 3 -->
 	<animation>
 		<type>pick</type>
@@ -1513,7 +1513,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>SEC3Btn1F</object-name>
@@ -1536,7 +1536,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>SEC3Btn2O</object-name>
@@ -1553,7 +1553,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- FAC 2 -->
 	<animation>
 		<type>pick</type>
@@ -1580,7 +1580,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>FAC2Btn1F</object-name>
@@ -1603,7 +1603,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>FAC2Btn2O</object-name>
@@ -1620,7 +1620,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- GPWS -->
 	<!--animation>
 		<name>GPWS terrain system pick</name>
@@ -1648,7 +1648,7 @@
 			</binding>
 		</action>
 	</animation-->
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>GPWSTerrBtn1F</object-name>
@@ -1671,7 +1671,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>GPWSTerrBtn2O</object-name>
@@ -1688,7 +1688,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>GPWS system pick</name>
 		<type>pick</type>
@@ -1715,7 +1715,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>GPWSBtn1F</object-name>
@@ -1738,7 +1738,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>GPWSBtn2O</object-name>
@@ -1781,7 +1781,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>GPWSGSBtn2O</object-name>
@@ -1824,7 +1824,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>GPWSFlpBtn2O</object-name>
@@ -1841,7 +1841,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>GPWS flaps pick</name>
 		<type>pick</type>
@@ -1867,7 +1867,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>GPWSFlp3Btn2O</object-name>
@@ -1884,7 +1884,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Hydraulic -->
 	<animation>
 		<name>Green Eng Pump pick</name>
@@ -1912,7 +1912,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>GreenEngPump1F</object-name>
@@ -1952,7 +1952,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>RAT MAN pick</name>
 		<type>pick</type>
@@ -2011,7 +2011,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>RATManGuard</object-name>
@@ -2032,7 +2032,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>RATManGuard</object-name>
@@ -2047,7 +2047,7 @@
 			<z2-m>0.14462</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<name>Blue Elec Pump pick</name>
 		<type>pick</type>
@@ -2074,7 +2074,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>BlueElecPump1F</object-name>
@@ -2114,7 +2114,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>PTU pick</name>
 		<type>pick</type>
@@ -2141,7 +2141,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>PTU1F</object-name>
@@ -2181,7 +2181,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>Yellow Eng Pump pick</name>
 		<type>pick</type>
@@ -2208,7 +2208,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>YellowEngPump1F</object-name>
@@ -2248,7 +2248,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>Yellow Eng Pump pick</name>
 		<type>pick</type>
@@ -2275,7 +2275,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>YellowElecPump1F</object-name>
@@ -2315,9 +2315,9 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Fuel -->
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>FuelXfeedBtn1</object-name>
@@ -2343,7 +2343,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>FuelXfeedBtn1O</object-name>
@@ -2376,7 +2376,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>LFuelTank1Btn1</object-name>
@@ -2402,7 +2402,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>LFuelTank1Btn1F</object-name>
@@ -2441,7 +2441,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>LFuelTank2Btn1</object-name>
@@ -2467,7 +2467,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>LFuelTank2Btn1F</object-name>
@@ -2506,7 +2506,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>CFuelTank1Btn1</object-name>
@@ -2532,7 +2532,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>CFuelTank1Btn1F</object-name>
@@ -2571,7 +2571,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!--animation>
 		<type>pick</type>
 		<object-name>FuelModeBtn</object-name>
@@ -2596,7 +2596,7 @@
 			</binding>
 		</action>
 	</animation-->
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>FuelModeBtn1F</object-name>
@@ -2635,7 +2635,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>CFuelTank2Btn1</object-name>
@@ -2661,7 +2661,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>CFuelTank2Btn1F</object-name>
@@ -2700,7 +2700,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>RFuelTank1Btn1</object-name>
@@ -2726,7 +2726,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>RFuelTank1Btn1F</object-name>
@@ -2765,7 +2765,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>RFuelTank2Btn1</object-name>
@@ -2791,7 +2791,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>RFuelTank2Btn1F</object-name>
@@ -2830,7 +2830,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Electrical -->
 	<animation>
 		<name>Galley pick</name>
@@ -2857,7 +2857,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>GalleyPwrBtn1F</object-name>
@@ -2897,7 +2897,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>Battery1 pick</name>
 		<type>pick</type>
@@ -2918,7 +2918,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>BatteryBtn11F</object-name>
@@ -2985,7 +2985,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>BatteryBtn21F</object-name>
@@ -3008,7 +3008,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>BatteryBtn22O</object-name>
@@ -3031,7 +3031,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>IDG 1 pick</name>
 		<type>pick</type>
@@ -3065,7 +3065,7 @@
 			</mod-up>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>IDG1Btn1F</object-name>
@@ -3082,7 +3082,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>Generator 1 pick</name>
 		<type>pick</type>
@@ -3115,7 +3115,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Gen1Btn1F</object-name>
@@ -3132,7 +3132,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Gen1Btn2O</object-name>
@@ -3149,7 +3149,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>AC ESS FEED pick</name>
 		<type>pick</type>
@@ -3181,7 +3181,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ACESSFeedBtn1F</object-name>
@@ -3248,7 +3248,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>APUGenBtn1F</object-name>
@@ -3271,7 +3271,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>APUGenBtn2O</object-name>
@@ -3288,7 +3288,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>Bus Tie pick</name>
 		<type>pick</type>
@@ -3319,7 +3319,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>BusTieBtn2O</object-name>
@@ -3363,7 +3363,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ExtPwrBtn1A</object-name>
@@ -3460,7 +3460,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Gen2Btn2O</object-name>
@@ -3477,7 +3477,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>IDG 2 pick</name>
 		<type>pick</type>
@@ -3511,7 +3511,7 @@
 			</mod-up>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>IDG2Btn1F</object-name>
@@ -3528,7 +3528,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>Emer Gen Test pick</name>
 		<type>pick</type>
@@ -3588,7 +3588,7 @@
 			</mod-up>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>EmerGenTestGuard</object-name>
@@ -3609,7 +3609,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>EmerGenTestGuard</object-name>
@@ -3624,7 +3624,7 @@
 			<z2-m>-0.028926</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<name>Gen 1 Line Contactor pick</name>
 		<type>pick</type>
@@ -3647,7 +3647,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Gen1LineBtn2O</object-name>
@@ -3670,7 +3670,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>EmerGenInd1F</object-name>
@@ -3699,7 +3699,7 @@
 			</and>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>ELEC RAT MAN pick</name>
 		<type>pick</type>
@@ -3759,7 +3759,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>EmerManOnGuard</object-name>
@@ -3780,7 +3780,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>EmerManOnGuard</object-name>
@@ -3795,7 +3795,7 @@
 			<z2-m>-0.02796</z2-m>
 		</axis>
 	</animation>
-	
+
 	<!-- Pneumatic -->
 	<animation>
 		<name>AC pack flow pick</name>
@@ -3855,7 +3855,7 @@
 			<z-m>-0.10197</z-m>
 		</center>
 	</animation>
-	
+
 	<animation>
 		<name>Cockpit Temp pick</name>
 		<type>pick</type>
@@ -3905,7 +3905,7 @@
 			<z-m>-0.10202</z-m>
 		</center>
 	</animation>
-	
+
 	<animation>
 		<name>FWD Temp pick</name>
 		<type>pick</type>
@@ -3955,7 +3955,7 @@
 			<z-m>-0.10202</z-m>
 		</center>
 	</animation>
-	
+
 	<animation>
 		<name>AFT Temp pick</name>
 		<type>pick</type>
@@ -4005,7 +4005,7 @@
 			<z-m>-0.10202</z-m>
 		</center>
 	</animation>
-	
+
 	<animation>
 		<name>X-Bleed pick</name>
 		<type>pick</type>
@@ -4097,7 +4097,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ACPack1Btn1F</object-name>
@@ -4164,7 +4164,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng1BleedBtn1F</object-name>
@@ -4237,7 +4237,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>APUBleedBtn1F</object-name>
@@ -4304,7 +4304,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng2BleedBtn1F</object-name>
@@ -4344,7 +4344,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>Hot Air pick</name>
 		<type>pick</type>
@@ -4370,7 +4370,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>HotAirBtn1F</object-name>
@@ -4443,7 +4443,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>ACPack2Btn1F</object-name>
@@ -4483,7 +4483,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>RAM Air Turb switch pick</name>
 		<type>pick</type>
@@ -4537,7 +4537,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>RamAirBtn</object-name>
@@ -4552,7 +4552,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>RamAirBtnProt</object-name>
@@ -4567,7 +4567,7 @@
 			<z2-m>-0.15269</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>RamAirBtn2O</object-name>
@@ -4584,7 +4584,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Cabin Pressurization -->
 	<animation>
 		<type>pick</type>
@@ -4670,7 +4670,7 @@
 			</mod-up>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<name>Man VS rotate</name>
 		<type>rotate</type>
@@ -4692,7 +4692,7 @@
 			<z-m>-0.2186</z-m>
 		</center>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>CabinPressModeBtn</object-name>
@@ -4717,7 +4717,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>CabinPressModeBtn1F</object-name>
@@ -4751,7 +4751,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>DitchBtn1</object-name>
@@ -4805,7 +4805,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>DitchBtn1</object-name>
@@ -4821,7 +4821,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>DitchProt</object-name>
@@ -4892,7 +4892,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<name>Strobe lights rotate</name>
 		<type>rotate</type>
@@ -5047,7 +5047,7 @@
 			<z-m>-0.265</z-m>
 		</center>
 	</animation>
-	
+
 	<animation>
 		<name>Turnoff light pick</name>
 		<type>pick</type>
@@ -5081,7 +5081,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<name>turnoff light rotate</name>
 		<type>rotate</type>
@@ -5102,7 +5102,7 @@
 			<z-m>-0.3037</z-m>
 		</center>
 	</animation>
-	
+
 	<animation>
 		<name>landing light pick</name>
 		<type>pick</type>
@@ -5138,7 +5138,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<name>landing light pick</name>
 		<type>pick</type>
@@ -5174,7 +5174,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<name>landing light rotate</name>
 		<type>rotate</type>
@@ -5195,7 +5195,7 @@
 			<z-m>-0.3037</z-m>
 		</center>
 	</animation>
-	
+
 	<animation>
 		<name>landing light rotate</name>
 		<type>rotate</type>
@@ -5276,7 +5276,7 @@
 
 	<!-- Anti-ice -->
 	<!-- Eng and Wing -->
-	
+
 	<animation>
 		<name>Wing Anti-ice Pick</name>
 		<type>pick</type>
@@ -5303,7 +5303,7 @@
 			</binding>
 		</action>
 	</animation>
-		
+
 	<animation>
 		<type>select</type>
 		<object-name>WingAntiIceBtn1F</object-name>
@@ -5320,7 +5320,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>WingAntiIceBtn2O</object-name>
@@ -5337,7 +5337,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>Left Engine Anti-ice Pick</name>
 		<type>pick</type>
@@ -5364,7 +5364,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng1AntiIceBtn1F</object-name>
@@ -5381,7 +5381,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng1AntiIceBtn2O</object-name>
@@ -5398,7 +5398,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<name>Right Engine Anti-ice Pick</name>
 		<type>pick</type>
@@ -5425,7 +5425,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng2AntiIceBtn1F</object-name>
@@ -5442,7 +5442,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng2AntiIceBtn2O</object-name>
@@ -5459,10 +5459,10 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Window Heat and Probe Button -->
 	<!-- 0.5 is auto, 1 is on -->
-	
+
 	<animation>
 		<name>Window Probe Heat Toggle</name>
 		<type>pick</type>
@@ -5490,7 +5490,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>PrbWinHeatBtn2O</object-name>
@@ -5507,7 +5507,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Cabin Fans -->
 	<animation>
 		<name>Cabin Fans Toggle</name>
@@ -5533,7 +5533,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>CabinFansBtn2O</object-name>
@@ -5550,7 +5550,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- APU -->
 	<animation>
 		<name>APU master switch pick</name>
@@ -5584,7 +5584,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>APUMasterBtn1F</object-name>
@@ -5598,7 +5598,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>APUMasterBtn2O</object-name>
@@ -5652,7 +5652,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>APUStartBtn1A</object-name>
@@ -5669,7 +5669,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>APUStartBtn2O</object-name>
@@ -5692,7 +5692,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Manual Start -->
 	<animation>
 		<type>pick</type>
@@ -5741,7 +5741,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>Eng1ManStartBtn1</object-name>
@@ -5766,7 +5766,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>Eng1ManStartProt</object-name>
@@ -5781,7 +5781,7 @@
 			<z2-m>-0.20418</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng1ManStartBtn2O</object-name>
@@ -5798,7 +5798,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>Eng2ManStartBtn1</object-name>
@@ -5846,7 +5846,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>Eng2ManStartBtn1</object-name>
@@ -5871,7 +5871,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>Eng2ManStartProt</object-name>
@@ -5886,7 +5886,7 @@
 			<z2-m>-0.20418</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng2ManStartBtn2O</object-name>
@@ -5903,7 +5903,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Interior lights -->
 	<animation>
 		<name>Overhead panel light pick</name>
@@ -5988,7 +5988,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<name>Dome lights rotate</name>
 		<type>rotate</type>
@@ -6010,7 +6010,7 @@
 			<z-m>-0.2597</z-m>
 		</center>
 	</animation>
-	
+
 	<animation>
 		<name>Annun lights pick</name>
 		<type>pick</type>
@@ -6091,7 +6091,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<name>Seatbelt sign rotate</name>
 		<type>rotate</type>
@@ -6172,7 +6172,7 @@
 			<z-m>-0.3037</z-m>
 		</center>
 	</animation>
-	
+
 	<animation>
 		<name>Emer Lights pick</name>
 		<type>pick</type>
@@ -6228,7 +6228,7 @@
 			<z-m>-0.3037</z-m>
 		</center>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>EmerExtLtBtn2O</object-name>
@@ -6245,7 +6245,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Texts -->
 	<text>
 		<name>Battery-volt</name>
@@ -6272,7 +6272,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<text>
 		<name>Battery-volt-test</name>
 		<offsets>
@@ -6324,7 +6324,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<text>
 		<name>Battery-volt-test</name>
 		<offsets>
@@ -6350,7 +6350,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Battery-volt</object-name>
@@ -6361,7 +6361,7 @@
 			</equals>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Battery-volt-test</object-name>
@@ -6372,7 +6372,7 @@
 			</equals>
 		</condition>
 	</animation>
-	
+
 	<!-- Fire Buttons -->
 	<!-- Engine 1 -->
 	<animation>
@@ -6396,7 +6396,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>Eng1FireCover</object-name>
@@ -6419,7 +6419,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>Eng1FireCover</object-name>
@@ -6434,19 +6434,30 @@
 			<z2-m>0.23523</z2-m>
 		</axis>
 	</animation>
-	
-    <animation>
-        <type>translate</type>
-		<object-name>Eng1FireBtn</object-name>
-        <property>controls/engines/engine[0]/fire-btn</property>
-        <factor>0.025</factor>
-        <axis>
-            <x>1</x>
-            <y>0</y>
-            <z>0</z>
-        </axis>
-    </animation>
-	
+
+		<animation>
+				<type>translate</type>
+				<object-name>Eng1FireBtn</object-name>
+				<property>controls/engines/engine[0]/fire-btn</property>
+				<factor>0.025</factor>
+				<axis>
+						<x>1</x>
+						<y>0</y>
+						<z>0</z>
+				</axis>
+		</animation>
+
+		<animation>
+			<type>select</type>
+			<object-name>Eng1FireBtn</object-name>
+			<condition>
+				<or>
+					<property>systems/fire/engine1/warning-active</property>
+					<property>controls/switches/annun-test</property>
+				</or>
+			</condition>
+		</animation>
+
 	<animation>
 		<type>material</type>
 		<object-name>Eng1FireBtn</object-name>
@@ -6454,10 +6465,9 @@
 			<red>1.0</red>
 			<green>1.0</green>
 			<blue>1.0</blue>
-			<factor-prop>systems/fire/engine1/warning-active</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>Eng1FireAgt1Btn1S</object-name>
@@ -6473,7 +6483,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>Eng1FireAgt2Btn1S</object-name>
@@ -6489,7 +6499,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng1FireAgt1Btn1S</object-name>
@@ -6511,7 +6521,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng1FireAgt1Btn2D</object-name>
@@ -6532,7 +6542,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng1FireAgt2Btn2D</object-name>
@@ -6553,7 +6563,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Test -->
 	<animation>
 		<type>pick</type>
@@ -6575,7 +6585,7 @@
 			</mod-up>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>Eng2FireTst</object-name>
@@ -6596,7 +6606,7 @@
 			</mod-up>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>APUFireTst</object-name>
@@ -6617,7 +6627,7 @@
 			</mod-up>
 		</action>
 	</animation>
-	
+
 	<!-- APU -->
 	<animation>
 		<type>pick</type>
@@ -6640,7 +6650,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>APUFireCover</object-name>
@@ -6663,7 +6673,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>APUFireCover</object-name>
@@ -6678,19 +6688,30 @@
 			<z2-m>0.25182</z2-m>
 		</axis>
 	</animation>
-	
-    <animation>
-        <type>translate</type>
+
+		<animation>
+				<type>translate</type>
 		<object-name>APUFireBtn</object-name>
-        <property>controls/APU/fire-btn</property>
-        <factor>0.025</factor>
-        <axis>
-            <x>1</x>
-            <y>0</y>
-            <z>0</z>
-        </axis>
-    </animation>
-	
+				<property>controls/APU/fire-btn</property>
+				<factor>0.025</factor>
+				<axis>
+						<x>1</x>
+						<y>0</y>
+						<z>0</z>
+				</axis>
+		</animation>
+
+		<animation>
+			<type>select</type>
+			<object-name>APUFireBtn</object-name>
+			<condition>
+				<or>
+					<property>/systems/fire/apu/warning-active</property>
+					<property>/controls/switches/annun-test</property>
+				</or>
+			</condition>
+		</animation>
+
 	<animation>
 		<type>material</type>
 		<object-name>APUFireBtn</object-name>
@@ -6698,10 +6719,10 @@
 			<red>1.0</red>
 			<green>1.0</green>
 			<blue>1.0</blue>
-			<factor-prop>systems/fire/apu/warning-active</factor-prop>
 		</emission>
 	</animation>
-	
+
+
 	<animation>
 		<type>pick</type>
 		<object-name>APUFireAgtBtn1S</object-name>
@@ -6717,7 +6738,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>APUFireAgtBtn1S</object-name>
@@ -6738,7 +6759,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>APUFireAgtBtn2D</object-name>
@@ -6759,7 +6780,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Engine 2 -->
 	<animation>
 		<type>pick</type>
@@ -6782,7 +6803,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>Eng2FireCover</object-name>
@@ -6805,7 +6826,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>Eng2FireCover</object-name>
@@ -6820,19 +6841,30 @@
 			<z2-m>0.23523</z2-m>
 		</axis>
 	</animation>
-	
-    <animation>
-        <type>translate</type>
+
+		<animation>
+				<type>translate</type>
 		<object-name>Eng2FireBtn</object-name>
-        <property>controls/engines/engine[1]/fire-btn</property>
-        <factor>0.025</factor>
-        <axis>
-            <x>1</x>
-            <y>0</y>
-            <z>0</z>
-        </axis>
-    </animation>
-	
+				<property>controls/engines/engine[1]/fire-btn</property>
+				<factor>0.025</factor>
+				<axis>
+						<x>1</x>
+						<y>0</y>
+						<z>0</z>
+				</axis>
+		</animation>
+
+		<animation>
+			<type>select</type>
+			<object-name>Eng2FireBtn</object-name>
+			<condition>
+				<or>
+					<property>systems/fire/engine2/warning-active</property>
+					<property>controls/switches/annun-test</property>
+				</or>
+			</condition>
+		</animation>
+
 	<animation>
 		<type>material</type>
 		<object-name>Eng2FireBtn</object-name>
@@ -6840,10 +6872,9 @@
 			<red>1.0</red>
 			<green>1.0</green>
 			<blue>1.0</blue>
-			<factor-prop>systems/fire/engine2/warning-active</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>Eng2FireAgt1Btn1S</object-name>
@@ -6859,7 +6890,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>Eng2FireAgt2Btn1S</object-name>
@@ -6875,7 +6906,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng2FireAgt1Btn1S</object-name>
@@ -6897,7 +6928,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng2FireAgt1Btn2D</object-name>
@@ -6918,7 +6949,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>Eng2FireAgt2Btn2D</object-name>
@@ -6939,7 +6970,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<!-- Sounds -->
 	<animation>
 		<type>pick</type>
@@ -6959,7 +6990,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>GroundCall</object-name>
@@ -6978,7 +7009,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>FwdCabinCall</object-name>
@@ -6997,7 +7028,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>LeftRainTest</object-name>
@@ -7020,7 +7051,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>RightRainTest</object-name>
@@ -7043,7 +7074,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<!--animation>
 		<type>rotate</type>
 		<object-name>LeftWiperKnb</object-name>
@@ -7063,7 +7094,7 @@
 			<z2-m>-0.26721</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>LeftWiperKnb</object-name>
@@ -7080,7 +7111,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>RightWiperKnb</object-name>
@@ -7100,7 +7131,7 @@
 			<z2-m>-0.26721</z2-m>
 		</axis>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>RightWiperKnb</object-name>
@@ -7117,7 +7148,7 @@
 			</binding>
 		</action>
 	</animation-->
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>PassOxyInd</object-name>
@@ -7141,7 +7172,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>PassOxyInd1S</object-name>
@@ -7158,7 +7189,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>CrewOxyBtn</object-name>
@@ -7182,7 +7213,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>CrewOxyBtn2O</object-name>
@@ -7199,7 +7230,7 @@
 			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>MaskManOnBtn</object-name>
@@ -7245,7 +7276,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>MaskManOnGuard</object-name>
@@ -7266,7 +7297,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>MaskManOnGuard</object-name>
@@ -7281,5 +7312,5 @@
 			<z2-m>-0.15783</z2-m>
 		</axis>
 	</animation>
-	
+
 </PropertyList>
diff --git a/Models/Instruments/Pedestal_up/Pedestal_up.xml b/Models/Instruments/Pedestal_up/Pedestal_up.xml
index 905d3d4d..683c0310 100644
--- a/Models/Instruments/Pedestal_up/Pedestal_up.xml
+++ b/Models/Instruments/Pedestal_up/Pedestal_up.xml
@@ -5,7 +5,7 @@
 <PropertyList>
 
 	<path>res/Pedestal_up.ac</path>
-	
+
 	<animation>
 		<name>Panel lighting</name>
 		<type>material</type>
@@ -53,18 +53,18 @@
 			<factor-prop>sim/model/lights/dome-light</factor-prop>
 		</emission>
 	</animation>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-flood-upper</inherits-from>
 		<object-name>throttle_1</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-flood-atc</inherits-from>
 		<object-name>atc_glare</object-name>
 		<object-name>atc_body</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-flood-engine</inherits-from>
 		<object-name>engine_body</object-name>
@@ -73,7 +73,7 @@
 		<object-name>Lcutoff</object-name>
 		<object-name>Rcutoff</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/brightness-panel-ped</inherits-from>
 		<object-name>vu111_body</object-name>
@@ -81,12 +81,12 @@
 		<object-name>vu111_glare</object-name>
 		<object-name>vu112_glare</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/dummy-gap</inherits-from>
 		<object-name>dummy_1</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/pedestal-flood-radar</inherits-from>
 		<object-name>radar_mode</object-name>
@@ -94,7 +94,7 @@
 		<object-name>radar_body</object-name>
 		<object-name>radar_glare</object-name>
 	</effect>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/cockpit-irradiance</inherits-from>
 		<object-name>ecam_body</object-name>
@@ -121,28 +121,7 @@
 		<object-name>vu112_aids</object-name>
 		<object-name>vu112_dfdr</object-name>
 	</effect>
-	
-	<animation>
-		<type>select</type>
-		<object-name>engine_fire_1</object-name>
-		<condition>
-			<property>systems/fire/engine1/warning-active</property>
-		</condition>
-	</animation>
-	
-	<animation>
-		<type>material</type>
-		<object-name>engine_fire_1</object-name>
-		<condition>
-			<property>systems/fire/engine1/warning-active</property>
-		</condition>
-		<emission>
-			<red>1.0</red>
-			<green>1.0</green>
-			<blue>1.0</blue>
-		</emission>
-	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>engine_fault_1</object-name>
@@ -150,28 +129,28 @@
 			<property>systems/unused/unused-ped</property>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>engine_fire_1</object-name>
 		<condition>
-			<property>systems/fire/engine1/warning-active</property>
+			<or>
+				<property>/systems/fire/engine1/warning-active</property>
+				<property>/controls/switches/annun-test</property>
+			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>material</type>
 		<object-name>engine_fire_1</object-name>
-		<condition>
-			<property>systems/fire/engine1/warning-active</property>
-		</condition>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>
 			<blue>1.0</blue>
 		</emission>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>engine_fault_2</object-name>
@@ -179,28 +158,28 @@
 			<property>systems/unused/unused-ped</property>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>engine_fire_2</object-name>
 		<condition>
-			<property>systems/fire/engine2/warning-active</property>
+			<or>
+				<property>/systems/fire/engine2/warning-active</property>
+				<property>/controls/switches/annun-test</property>
+			</or>
 		</condition>
 	</animation>
-	
+
 	<animation>
 		<type>material</type>
 		<object-name>engine_fire_2</object-name>
-		<condition>
-			<property>systems/fire/engine2/warning-active</property>
-		</condition>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>
 			<blue>1.0</blue>
 		</emission>
 	</animation>
-	
+
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/cockpit-irradiance</inherits-from>
 		<object-name>atc_0</object-name>
@@ -221,7 +200,7 @@
 		<object-name>atc_sys</object-name>
 		<object-name>atc_thrt</object-name>
 	</effect>
-	
+
 	<text>
 		<name>atc-code</name>
 		<offsets>
@@ -246,7 +225,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<text>
 		<name>atc-test</name>
 		<offsets>
@@ -269,7 +248,7 @@
 			<height type="int">32</height>
 		</font-resolution>
 	</text>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>atc_0</object-name>
@@ -282,7 +261,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>atc_1</object-name>
@@ -295,7 +274,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>atc_2</object-name>
@@ -308,7 +287,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>atc_3</object-name>
@@ -321,7 +300,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>atc_4</object-name>
@@ -334,7 +313,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>atc_5</object-name>
@@ -347,7 +326,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>atc_6</object-name>
@@ -360,7 +339,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>atc_7</object-name>
@@ -373,7 +352,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>atc_clr</object-name>
@@ -386,7 +365,7 @@
 			</binding>
 		</action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>atc_sys</object-name>
@@ -404,7 +383,7 @@
 		</axis>
 		<property>controls/atc/system-knob</property>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>atc_sys</object-name>
@@ -422,7 +401,7 @@
             </binding>
         </action>
 	</animation>
-	
+
 	<animation>
 		<type>rotate</type>
 		<object-name>atc_stby</object-name>
@@ -440,7 +419,7 @@
 		</axis>
 		<property>controls/atc/mode-knob</property>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>atc_stby</object-name>
@@ -479,7 +458,7 @@
             </binding>
         </action>
 	</animation>
-	
+
 	<animation>
 		<type>pick</type>
 		<object-name>atc_ident</object-name>
@@ -491,7 +470,7 @@
             </binding>
         </action>
 	</animation>
-	
+
 	<animation>
 		<type>select</type>
 		<object-name>atc_fail</object-name>

From 0c974e07dcd0d588d52f9462e52224886014e496 Mon Sep 17 00:00:00 2001
From: Semir Gebran <semgeb@wp.pl>
Date: Thu, 24 Oct 2019 23:33:06 +0200
Subject: [PATCH 3/5] Fixed Fire Buttons not animating correctly

---
 Models/Instruments/OHpanel/OHpanel.xml | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 6fe58047..069dd8ba 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -6375,6 +6375,17 @@
 
 	<!-- Fire Buttons -->
 	<!-- Engine 1 -->
+
+<animation>
+	<type>material</type>
+	<object-name>firebtn1</object-name>
+	<emission>
+		<red>1.0</red>
+		<green>1.0</green>
+		<blue>1.0</blue>
+	</emission>
+</animation>
+
 	<animation>
 		<type>pick</type>
 		<object-name>Eng1FireBtn</object-name>
@@ -6449,7 +6460,7 @@
 
 		<animation>
 			<type>select</type>
-			<object-name>Eng1FireBtn</object-name>
+			<object-name>firebtn1</object-name>
 			<condition>
 				<or>
 					<property>systems/fire/engine1/warning-active</property>
@@ -6460,7 +6471,7 @@
 
 	<animation>
 		<type>material</type>
-		<object-name>Eng1FireBtn</object-name>
+		<object-name>firebtn1</object-name>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>
@@ -6703,7 +6714,7 @@
 
 		<animation>
 			<type>select</type>
-			<object-name>APUFireBtn</object-name>
+			<object-name>firebtnapu</object-name>
 			<condition>
 				<or>
 					<property>/systems/fire/apu/warning-active</property>
@@ -6714,7 +6725,7 @@
 
 	<animation>
 		<type>material</type>
-		<object-name>APUFireBtn</object-name>
+		<object-name>firebtnapu</object-name>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>
@@ -6722,7 +6733,6 @@
 		</emission>
 	</animation>
 
-
 	<animation>
 		<type>pick</type>
 		<object-name>APUFireAgtBtn1S</object-name>
@@ -6856,7 +6866,7 @@
 
 		<animation>
 			<type>select</type>
-			<object-name>Eng2FireBtn</object-name>
+			<object-name>firebtn2</object-name>
 			<condition>
 				<or>
 					<property>systems/fire/engine2/warning-active</property>
@@ -6867,7 +6877,7 @@
 
 	<animation>
 		<type>material</type>
-		<object-name>Eng2FireBtn</object-name>
+		<object-name>firebtn2</object-name>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>

From 22a4b4b0a986ac4899538eced1ea39edaded0332 Mon Sep 17 00:00:00 2001
From: Semir Gebran <semgeb@wp.pl>
Date: Thu, 24 Oct 2019 23:47:25 +0200
Subject: [PATCH 4/5] cleaned up some leftover residue junk from last fix

---
 Models/Instruments/OHpanel/OHpanel.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 069dd8ba..9f6d73ae 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -6376,16 +6376,6 @@
 	<!-- Fire Buttons -->
 	<!-- Engine 1 -->
 
-<animation>
-	<type>material</type>
-	<object-name>firebtn1</object-name>
-	<emission>
-		<red>1.0</red>
-		<green>1.0</green>
-		<blue>1.0</blue>
-	</emission>
-</animation>
-
 	<animation>
 		<type>pick</type>
 		<object-name>Eng1FireBtn</object-name>

From badbd2a10465ac8748ec58a29e824284796aca3a Mon Sep 17 00:00:00 2001
From: Semir Gebran <semgeb@wp.pl>
Date: Fri, 25 Oct 2019 16:43:56 +0200
Subject: [PATCH 5/5] Brightness and translate fix for OH fire buttons

---
 Models/Instruments/OHpanel/OHpanel.xml | 58 ++++++++++----------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 9f6d73ae..fe443005 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -6376,6 +6376,7 @@
 	<!-- Fire Buttons -->
 	<!-- Engine 1 -->
 
+
 	<animation>
 		<type>pick</type>
 		<object-name>Eng1FireBtn</object-name>
@@ -6448,20 +6449,15 @@
 				</axis>
 		</animation>
 
-		<animation>
-			<type>select</type>
-			<object-name>firebtn1</object-name>
-			<condition>
-				<or>
-					<property>systems/fire/engine1/warning-active</property>
-					<property>controls/switches/annun-test</property>
-				</or>
-			</condition>
-		</animation>
-
 	<animation>
 		<type>material</type>
-		<object-name>firebtn1</object-name>
+		<object-name>Eng1FireBtn</object-name>
+		<condition>
+			<or>
+				<property>systems/fire/engine1/warning-active</property>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>
@@ -6702,20 +6698,15 @@
 				</axis>
 		</animation>
 
-		<animation>
-			<type>select</type>
-			<object-name>firebtnapu</object-name>
-			<condition>
-				<or>
-					<property>/systems/fire/apu/warning-active</property>
-					<property>/controls/switches/annun-test</property>
-				</or>
-			</condition>
-		</animation>
-
 	<animation>
 		<type>material</type>
-		<object-name>firebtnapu</object-name>
+		<object-name>APUFireBtn</object-name>
+		<condition>
+			<or>
+				<property>/systems/fire/apu/warning-active</property>
+				<property>/controls/switches/annun-test</property>
+			</or>
+		</condition>
 		<emission>
 			<red>1.0</red>
 			<green>1.0</green>
@@ -6855,26 +6846,21 @@
 		</animation>
 
 		<animation>
-			<type>select</type>
-			<object-name>firebtn2</object-name>
+			<type>material</type>
+			<object-name>Eng2FireBtn</object-name>
 			<condition>
 				<or>
 					<property>systems/fire/engine2/warning-active</property>
 					<property>controls/switches/annun-test</property>
 				</or>
 			</condition>
+			<emission>
+				<red>1.0</red>
+				<green>1.0</green>
+				<blue>1.0</blue>
+			</emission>
 		</animation>
 
-	<animation>
-		<type>material</type>
-		<object-name>firebtn2</object-name>
-		<emission>
-			<red>1.0</red>
-			<green>1.0</green>
-			<blue>1.0</blue>
-		</emission>
-	</animation>
-
 	<animation>
 		<type>pick</type>
 		<object-name>Eng2FireAgt1Btn1S</object-name>