diff --git a/A320-main.xml b/A320-main.xml
index cfa285fe..5c1d09d2 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -799,6 +799,7 @@
 	<nasal>
 		<libraries>
 			<file>Aircraft/A320Family/Nasal/libraries.nas</file>
+			<file>Aircraft/A320Family/Nasal/buttons.nas</file>
 			<file>Aircraft/A320Family/Nasal/PFD_FMA.nas</file>
 			<file>Aircraft/A320Family/Nasal/gpws.nas</file>
 			<file>Aircraft/A320Family/Nasal/efis.nas</file>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index ad0610b4..b9357d17 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -87,6 +87,13 @@
 		<object-name>FuelXfeedBtn2O</object-name>
 		<object-name>GalleyPwrBtn1F</object-name>
 		<object-name>GalleyPwrBtn2O</object-name>
+		<object-name>GPWSBtn1F</object-name>
+		<object-name>GPWSBtn2O</object-name>
+		<object-name>GPWSFlpBtn2O</object-name>
+		<object-name>GPWSFlp3Btn2O</object-name>
+		<object-name>GPWSGSBtn2O</object-name>
+		<object-name>GPWSTerrBtn1F</object-name>
+		<object-name>GPWSTerrBtn2O</object-name>
 		<object-name>GreenEngPump1F</object-name>
 		<object-name>GreenEngPump2O</object-name>
 		<object-name>HotAirBtn1F</object-name>
@@ -834,41 +841,135 @@
 	<!--animation>
 		<name>GPWS system pick</name>
 		<type>pick</type>
-		<object-name>GPWSBtn1</object-name>
-		<object-name>GPWSBtn2</object-name>
+		<object-name>GPWSTerrBtn1</object-name>
+		<object-name>GPWSTerrBtn2</object-name>
+		<object-name>GPWSTerrBtn1F</object-name>
+		<object-name>GPWSTerrBtn2O</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
-				<property>instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
+				<property>/instrumentation/mk-viii/inputs/discretes/terr-inhibit</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
+			</binding>
+		</action>
+	</animation-->
+	
+	<animation>
+		<type>select</type>
+		<object-name>GPWSTerrBtn1F</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/instrumentation/mk-viii/serviceable</property>
+					<value>0</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>GPWSTerrBtn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/instrumentation/mk-viii/inputs/discretes/terr-inhibit</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<animation>
+		<name>GPWS system pick</name>
+		<type>pick</type>
+		<object-name>GPWSBtn1</object-name>
+		<object-name>GPWSBtn2</object-name>
+		<object-name>GPWSBtn1F</object-name>
+		<object-name>GPWSBtn2O</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
+				<command>property-toggle</command>
+				<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
+	
 	<animation>
-		<name>GPWS system fault</name>
-		<type>textranslate</type>
-		<object-name>GPWSBtn1</object-name>
-		<property>instrumentation/mk-viii/serviceable</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>0.5</dep></entry>
-			<entry><ind>1</ind><dep>0</dep></entry>
-		</interpolation>
-		<axis>
-			<x>1</x>
-			<y>0</y>
-		</axis>
+		<type>select</type>
+		<object-name>GPWSBtn1F</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/instrumentation/mk-viii/serviceable</property>
+					<value>0</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
 	</animation>
+	
 	<animation>
-		<name>GPWS system off</name>
-		<type>textranslate</type>
-		<object-name>GPWSBtn2</object-name>
-		<property>instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
-		<factor>0.5</factor>
-		<axis>
-			<x>1</x>
-			<y>0</y>
-		</axis>
+		<type>select</type>
+		<object-name>GPWSBtn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/instrumentation/mk-viii/inputs/discretes/gpws-inhibit</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
 	</animation>
 
 	<animation>
@@ -876,25 +977,48 @@
 		<type>pick</type>
 		<object-name>GPWSGSBtn1</object-name>
 		<object-name>GPWSGSBtn2</object-name>
+		<object-name>GPWSGSBtn2O</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
-				<property>instrumentation/mk-viii/inputs/discretes/glideslope-cancel</property>
+				<property>/instrumentation/mk-viii/inputs/discretes/glideslope-cancel</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
+	
 	<animation>
-		<name>GPWS glideslope off</name>
-		<type>textranslate</type>
-		<object-name>GPWSGSBtn2</object-name>
-		<property>instrumentation/mk-viii/inputs/discretes/glideslope-cancel</property>
-		<factor>0.5</factor>
-		<axis>
-			<x>1</x>
-			<y>0</y>
-		</axis>
+		<type>select</type>
+		<object-name>GPWSGSBtn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/instrumentation/mk-viii/inputs/discretes/glideslope-cancel</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
 	</animation>
 
 	<animation>
@@ -902,25 +1026,48 @@
 		<type>pick</type>
 		<object-name>GPWSFlpBtn1</object-name>
 		<object-name>GPWSFlpBtn2</object-name>
+		<object-name>GPWSFlpBtn2O</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
-				<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-override</property>
+				<property>/instrumentation/mk-viii/inputs/discretes/momentary-flap-override</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
+	
 	<animation>
-		<name>GPWS flaps off</name>
-		<type>textranslate</type>
-		<object-name>GPWSFlpBtn2</object-name>
-		<property>instrumentation/mk-viii/inputs/discretes/momentary-flap-override</property>
-		<factor>0.5</factor>
-		<axis>
-			<x>1</x>
-			<y>0</y>
-		</axis>
+		<type>select</type>
+		<object-name>GPWSFlpBtn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/instrumentation/mk-viii/inputs/discretes/momentary-flap-override</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
 	</animation>
 	
 	<animation>
@@ -928,26 +1075,49 @@
 		<type>pick</type>
 		<object-name>GPWSFlp3Btn1</object-name>
 		<object-name>GPWSFlp3Btn2</object-name>
+		<object-name>GPWSFlp3Btn2O</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 				<command>property-toggle</command>
-				<property>instrumentation/mk-viii/inputs/discretes/momentary-flap3-override</property>
+				<property>/instrumentation/mk-viii/inputs/discretes/momentary-flap3-override</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/oh-btn", 1);</script>
 			</binding>
 		</action>
 	</animation>
+	
 	<animation>
-		<name>GPWS flaps off</name>
-		<type>textranslate</type>
-		<object-name>GPWSFlp3Btn2</object-name>
-		<property>instrumentation/mk-viii/inputs/discretes/momentary-flap3-override</property>
-		<factor>0.5</factor>
-		<axis>
-			<x>1</x>
-			<y>0</y>
-		</axis>
-	</animation-->
+		<type>select</type>
+		<object-name>GPWSFlp3Btn2O</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>/instrumentation/mk-viii/inputs/discretes/momentary-flap3-override</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>/controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
 
 	<!-- Fire controls -->
 	<!--animation>
diff --git a/Models/Instruments/OHpanel/res/background.png b/Models/Instruments/OHpanel/res/background.png
index 81a48229..61a73017 100644
Binary files a/Models/Instruments/OHpanel/res/background.png and b/Models/Instruments/OHpanel/res/background.png differ
diff --git a/Models/Instruments/OHpanel/res/buttons4-grid.png b/Models/Instruments/OHpanel/res/buttons4-grid.png
index 2d3b5ef5..74bead4b 100644
Binary files a/Models/Instruments/OHpanel/res/buttons4-grid.png and b/Models/Instruments/OHpanel/res/buttons4-grid.png differ
diff --git a/Models/Instruments/OHpanel/res/buttons4.png b/Models/Instruments/OHpanel/res/buttons4.png
index e5666e6e..6d0b1739 100644
Binary files a/Models/Instruments/OHpanel/res/buttons4.png and b/Models/Instruments/OHpanel/res/buttons4.png differ
diff --git a/Models/Instruments/OHpanel/res/markings.png b/Models/Instruments/OHpanel/res/markings.png
index b98c5a51..84cd7adc 100644
Binary files a/Models/Instruments/OHpanel/res/markings.png and b/Models/Instruments/OHpanel/res/markings.png differ
diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac
index 489adc20..a0c126a9 100644
--- a/Models/Instruments/OHpanel/res/ohpanel.ac
+++ b/Models/Instruments/OHpanel/res/ohpanel.ac
@@ -8,7 +8,375 @@ MATERIAL "OHPanelOnBat" rgb 0.8 0.8 0.8  amb 1 1 1  emis 1 1 1  spec 0.5 0.5 0.5
 MATERIAL "Switch" rgb 0.678431 0.678431 0.678431  amb 0.678431 0.678431 0.678431  emis 0 0 0  spec 0 0 0  shi 32  trans 0.004
 MATERIAL "ac3dmat1" rgb 1 1 1  amb 1 1 1  emis 0 0 0  spec 1 1 1  shi 128  trans 0
 OBJECT world
-kids 271
+kids 280
+OBJECT poly
+name "GPWSTerrBtn1F"
+loc 0.0128834 -0.14875 0.101742
+data 8
+Cube.135
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.003448 0.0683 0.193106
+-0.000968002 0.0683 0.212952
+-0.003944 0.0683 0.213324
+-0.006425 0.0683 0.193478
+-0.003448 0.0583 0.193106
+-0.000968002 0.0583 0.212952
+-0.003944 0.0583 0.213324
+-0.006425 0.0583 0.193478
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0.5
+3 0.5 0.5
+2 9.31321e-008 0.5
+1 9.31321e-008 0.5
+SURF 0x0
+mat 4
+refs 4
+4 0.5 0.25
+0 0.5 0.5
+1 9.31321e-008 0.5
+5 0 0.25
+SURF 0x0
+mat 4
+refs 4
+5 0 0.25
+1 9.31321e-008 0.5
+2 9.31321e-008 0.5
+6 0 0.25
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0.25
+3 0.5 0.5
+0 0.5 0.5
+4 0.5 0.25
+kids 0
+OBJECT poly
+name "GPWSTerrBtn2O"
+loc 0.0128834 -0.14875 0.101742
+data 8
+Cube.134
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.006425 0.0583 0.193478
+-0.003944 0.0583 0.213324
+-0.000968002 0.0583 0.212952
+-0.003448 0.0583 0.193106
+-0.006425 0.0483 0.193478
+-0.003944 0.0483 0.213324
+-0.000967003 0.0483 0.212952
+-0.003448 0.0483 0.193106
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+3 0.5 0.25
+7 0.5 0
+4 0.5 0
+0 0.5 0.25
+SURF 0x0
+mat 4
+refs 4
+6 0 1.19209e-007
+2 9.31321e-008 0.25
+1 9.31321e-008 0.25
+5 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0
+3 0.5 0.25
+2 9.31321e-008 0.25
+6 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0
+6 0 1.19209e-007
+5 0 1.19209e-007
+4 0.5 0
+kids 0
+OBJECT poly
+name "GPWSTerrBtn1"
+loc 0.00080606 -5.00064e-005 0.00529382
+data 8
+Cube.118
+texture "buttons.png"
+crease 30.000000
+numvert 8
+0.005631 -0.0904 0.289928
+0.008112 -0.0904 0.309773
+0.011089 -0.0904 0.309401
+0.008608 -0.0904 0.289556
+0.005631 -0.0804 0.289928
+0.008112 -0.0804 0.309773
+0.011089 -0.0804 0.309401
+0.008608 -0.0804 0.289556
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0.25
+4 0.5 0.5
+7 0.5 0.5
+3 0.5 0.25
+SURF 0x0
+mat 4
+refs 4
+2 0 0.25
+6 9.31321e-008 0.5
+5 9.31321e-008 0.5
+1 0 0.25
+SURF 0x0
+mat 4
+refs 4
+3 0.5 0.25
+7 0.5 0.5
+6 9.31321e-008 0.5
+2 0 0.25
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0.5
+4 0.5 0.5
+5 9.31321e-008 0.5
+6 9.31321e-008 0.5
+kids 0
+OBJECT poly
+name "GPWSTerrBtn2"
+loc 0.00080606 -5.00064e-005 0.00529382
+data 8
+Cube.117
+texture "buttons.png"
+crease 30.000000
+numvert 8
+0.008608 -0.1004 0.289556
+0.011089 -0.1004 0.309401
+0.008112 -0.1004 0.309773
+0.005631 -0.1004 0.289928
+0.008608 -0.0904 0.289556
+0.011089 -0.0904 0.309401
+0.008112 -0.0904 0.309773
+0.005631 -0.0904 0.289928
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0
+1 0 1.19209e-007
+2 0 1.19209e-007
+3 0.5 0
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0
+4 0.5 0.25
+5 9.31321e-008 0.25
+1 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+1 0 1.19209e-007
+5 9.31321e-008 0.25
+6 9.31321e-008 0.25
+2 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+4 0.5 0.25
+0 0.5 0
+3 0.5 0
+7 0.5 0.25
+kids 0
+OBJECT poly
+name "GPWSFlpBtn2O"
+loc 0.00201484 -0.14875 0.0150691
+data 8
+Cube.134
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.003448 0.0483 0.193106
+-0.000967002 0.0483 0.212952
+-0.003944 0.0483 0.213324
+-0.006425 0.0483 0.193478
+-0.003448 0.0583 0.193106
+-0.000968002 0.0583 0.212952
+-0.003944 0.0583 0.213324
+-0.006425 0.0583 0.193478
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0
+1 0 1.19209e-007
+2 0 1.19209e-007
+3 0.5 0
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0
+4 0.5 0.25
+5 9.31321e-008 0.25
+1 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+1 0 1.19209e-007
+5 9.31321e-008 0.25
+6 9.31321e-008 0.25
+2 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+4 0.5 0.25
+0 0.5 0
+3 0.5 0
+7 0.5 0.25
+kids 0
+OBJECT poly
+name "GPWSBtn1F"
+loc 0.0091907 -0.14875 0.0728764
+data 8
+Cube.135
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.006425 0.0583 0.193478
+-0.003944 0.0583 0.213324
+-0.000968002 0.0583 0.212952
+-0.003448 0.0583 0.193106
+-0.006425 0.0683 0.193478
+-0.003944 0.0683 0.213324
+-0.000968002 0.0683 0.212952
+-0.003448 0.0683 0.193106
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0.25
+4 0.5 0.5
+7 0.5 0.5
+3 0.5 0.25
+SURF 0x0
+mat 4
+refs 4
+2 0 0.25
+6 9.31321e-008 0.5
+5 9.31321e-008 0.5
+1 0 0.25
+SURF 0x0
+mat 4
+refs 4
+3 0.5 0.25
+7 0.5 0.5
+6 9.31321e-008 0.5
+2 0 0.25
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0.5
+4 0.5 0.5
+5 9.31321e-008 0.5
+6 9.31321e-008 0.5
+kids 0
+OBJECT poly
+name "GPWSBtn2O"
+loc 0.0091907 -0.14875 0.0728764
+data 8
+Cube.134
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.003448 0.0483 0.193106
+-0.000967003 0.0483 0.212952
+-0.003944 0.0483 0.213324
+-0.006425 0.0483 0.193478
+-0.003448 0.0583 0.193106
+-0.000968002 0.0583 0.212952
+-0.003944 0.0583 0.213324
+-0.006425 0.0583 0.193478
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0
+1 0 1.19209e-007
+2 0 1.19209e-007
+3 0.5 0
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0
+4 0.5 0.25
+5 9.31321e-008 0.25
+1 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+1 0 1.19209e-007
+5 9.31321e-008 0.25
+6 9.31321e-008 0.25
+2 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+4 0.5 0.25
+0 0.5 0
+3 0.5 0
+7 0.5 0.25
+kids 0
+OBJECT poly
+name "GPWSGSBtn2O"
+loc 0.00559211 -0.14875 0.0437936
+data 8
+Cube.134
+texture "buttons2.png"
+crease 30.000000
+numvert 8
+-0.006425 0.0583 0.193478
+-0.003944 0.0583 0.213324
+-0.000968002 0.0583 0.212952
+-0.003448 0.0583 0.193106
+-0.006425 0.0483 0.193478
+-0.003944 0.0483 0.213324
+-0.000967002 0.0483 0.212952
+-0.003448 0.0483 0.193106
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+3 0.5 0.25
+7 0.5 0
+4 0.5 0
+0 0.5 0.25
+SURF 0x0
+mat 4
+refs 4
+6 0 1.19209e-007
+2 9.31321e-008 0.25
+1 9.31321e-008 0.25
+5 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0
+3 0.5 0.25
+2 9.31321e-008 0.25
+6 0 1.19209e-007
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0
+6 0 1.19209e-007
+5 0 1.19209e-007
+4 0.5 0
+kids 0
 OBJECT poly
 name "PrbWinHeatBtn2O"
 loc 0.000175806 -0.17185 0.0418501
@@ -19307,7 +19675,7 @@ refs 4
 kids 0
 OBJECT poly
 name "GPWSBtn1"
-loc 0.000113685 -5.00064e-005 -4.99785e-005
+loc -0.00288661 -5.00064e-005 -0.0235722
 data 8
 Cube.118
 texture "buttons.png"
@@ -19353,7 +19721,7 @@ refs 4
 kids 0
 OBJECT poly
 name "GPWSBtn2"
-loc 0.000113685 -5.00064e-005 -4.99785e-005
+loc -0.00288661 -5.00064e-005 -0.0235722
 data 8
 Cube.117
 texture "buttons.png"
@@ -19399,7 +19767,7 @@ refs 4
 kids 0
 OBJECT poly
 name "GPWSFlp3Btn1"
-loc 0.000113685 -5.00064e-005 -4.99785e-005
+loc -0.00107874 -5.00064e-005 -0.0100593
 data 8
 Cube.123
 texture "buttons.png"
@@ -19445,7 +19813,7 @@ refs 4
 kids 0
 OBJECT poly
 name "GPWSFlp3Btn2"
-loc 0.000113685 -5.00064e-005 -4.99785e-005
+loc -0.00107874 -5.00064e-005 -0.0100593
 data 8
 Cube.124
 texture "buttons.png"
@@ -19491,7 +19859,7 @@ refs 4
 kids 0
 OBJECT poly
 name "GPWSFlpBtn1"
-loc 0.000113685 -5.00064e-005 -4.99785e-005
+loc -0.00173265 -5.00064e-005 -0.014799
 data 8
 Cube.122
 texture "buttons.png"
@@ -19537,7 +19905,7 @@ refs 4
 kids 0
 OBJECT poly
 name "GPWSFlpBtn2"
-loc 0.000113685 -5.00064e-005 -4.99785e-005
+loc -0.00173265 -5.00064e-005 -0.014799
 data 8
 Cube.121
 texture "buttons.png"
@@ -19583,7 +19951,7 @@ refs 4
 kids 0
 OBJECT poly
 name "GPWSGSBtn1"
-loc 0.000113685 -5.00064e-005 -4.99785e-005
+loc -0.00238656 -5.00064e-005 -0.020008
 data 8
 Cube.119
 texture "buttons.png"
@@ -19629,7 +19997,7 @@ refs 4
 kids 0
 OBJECT poly
 name "GPWSGSBtn2"
-loc 0.000113685 -5.00064e-005 -4.99785e-005
+loc -0.00238656 -5.00064e-005 -0.020008
 data 8
 Cube.120
 texture "buttons.png"
@@ -21254,9 +21622,9 @@ numvert 49
 0.0025102 0.179365 0.32237
 0.00243509 0.176307 0.321765
 0.0025102 0.173249 0.32237
--0.000326788 0.171717 0.319004
+-0.000326789 0.171717 0.319004
 -0.00044011 0.176307 0.318097
--0.000326788 0.180896 0.319004
+-0.000326789 0.180896 0.319004
 -3.95253e-006 0.184786 0.321582
 0.000478322 0.187386 0.325442
 0.00104756 0.188298 0.329996
@@ -35225,3 +35593,49 @@ refs 4
 5 0 0.5
 4 0.5 0.5
 kids 0
+OBJECT poly
+name "GPWSFlp3Btn2O"
+loc -0.00154958 -0.15875 -0.0139293
+data 8
+Cube.135
+texture "buttons4.png"
+crease 30.000000
+numvert 8
+-0.003448 0.0683 0.193106
+-0.000968002 0.0683 0.212952
+-0.003944 0.0683 0.213324
+-0.006425 0.0683 0.193478
+-0.003448 0.0583 0.193106
+-0.000968002 0.0583 0.212952
+-0.003944 0.0583 0.213324
+-0.006425 0.0583 0.193478
+numsurf 4
+SURF 0x0
+mat 4
+refs 4
+0 0.5 0.5
+3 0.5 0.5
+2 9.31321e-008 0.5
+1 9.31321e-008 0.5
+SURF 0x0
+mat 4
+refs 4
+4 0.5 0.25
+0 0.5 0.5
+1 9.31321e-008 0.5
+5 0 0.25
+SURF 0x0
+mat 4
+refs 4
+5 0 0.25
+1 9.31321e-008 0.5
+2 9.31321e-008 0.5
+6 0 0.25
+SURF 0x0
+mat 4
+refs 4
+7 0.5 0.25
+3 0.5 0.5
+0 0.5 0.5
+4 0.5 0.25
+kids 0
diff --git a/Nasal/buttons.nas b/Nasal/buttons.nas
new file mode 100644
index 00000000..fe95fe16
--- /dev/null
+++ b/Nasal/buttons.nas
@@ -0,0 +1,112 @@
+# A3XX Buttons
+# Joshua Davidson (it0uchpods)
+
+# Resets buttons to the default values
+var variousReset = func {
+	setprop("/modes/cpt-du-xfr", 0);
+	setprop("/modes/fo-du-xfr", 0);
+	setprop("/controls/fadec/n1mode1", 0);
+	setprop("/controls/fadec/n1mode2", 0);
+	setprop("/instrumentation/mk-viii/serviceable", 1);
+	setprop("/instrumentation/mk-viii/inputs/discretes/terr-inhibit", 0);
+	setprop("/instrumentation/mk-viii/inputs/discretes/gpws-inhibit", 0);
+	setprop("/instrumentation/mk-viii/inputs/discretes/glideslope-cancel", 0);
+	setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap-override", 0);
+	setprop("/instrumentation/mk-viii/inputs/discretes/momentary-flap3-override", 0);
+}
+
+var mcpSPDKnbPull = func {
+	setprop("/it-autoflight/input/spd-managed", 0);
+	fmgc.ManagedSPD.stop();
+	var ias = getprop("/instrumentation/airspeed-indicator/indicated-speed-kt");
+	var mach = getprop("/instrumentation/airspeed-indicator/indicated-mach");
+	if (getprop("/it-autoflight/input/kts-mach") == 0) {
+		if (ias >= 100 and ias <= 360) {
+			setprop("/it-autoflight/input/spd-kts", math.round(ias, 1));
+		} else if (ias < 100) {
+			setprop("/it-autoflight/input/spd-kts", 100);
+		} else if (ias > 360) {
+			setprop("/it-autoflight/input/spd-kts", 360);
+		}
+	} else if (getprop("/it-autoflight/input/kts-mach") == 1) {
+		if (mach >= 0.50 and mach <= 0.95) {
+			setprop("/it-autoflight/input/spd-kts", math.round(mach, 0.001));
+		} else if (mach < 0.50) {
+			setprop("/it-autoflight/input/spd-kts", 0.50);
+		} else if (mach > 0.95) {
+			setprop("/it-autoflight/input/spd-kts", 0.95);
+		}
+	}
+}
+
+var mcpSPDKnbPush = func {
+	if (getprop("/FMGC/internal/cruise-lvl-set") == 1 and getprop("/FMGC/internal/cost-index-set") == 1) {
+		setprop("/it-autoflight/input/spd-managed", 1);
+		fmgc.ManagedSPD.start();
+	} else {
+		gui.popupTip("Please make sure you have set a cruise altitude and cost index in the MCDU.");
+	}
+}
+
+var mcpHDGKnbPull = func {
+	var latmode = getprop("/it-autoflight/output/lat");
+	var showhdg = getprop("/it-autoflight/custom/show-hdg");
+	if (latmode == 0 or showhdg == 0) {
+		setprop("/it-autoflight/input/lat", 3);
+		setprop("/it-autoflight/custom/show-hdg", 1);
+	} else {
+		setprop("/it-autoflight/input/lat", 0);
+		setprop("/it-autoflight/custom/show-hdg", 1);
+	}
+}
+
+var mcpHDGKnbPush = func {
+	setprop("/it-autoflight/input/lat", 1);
+}
+
+var hdgInput = func {
+	var latmode = getprop("/it-autoflight/output/lat");
+	if (latmode != 0) {
+		setprop("/it-autoflight/custom/show-hdg", 1);
+		var hdgnow = getprop("/it-autoflight/input/hdg");
+		settimer(func {
+			var hdgnew = getprop("/it-autoflight/input/hdg");
+			var showhdg = getprop("/it-autoflight/custom/show-hdg");
+			if (hdgnow == hdgnew and latmode != 5 and showhdg == 1) {
+				settimer(func {
+					setprop("/it-autoflight/custom/show-hdg", 0);
+				}, 10);
+			}
+		}, 2);
+	}
+}
+
+var toggleSTD = func {
+	var Std = getprop("/modes/altimeter/std");
+	if (Std == 1) {
+		var oldqnh = getprop("/modes/altimeter/oldqnh");
+		setprop("/instrumentation/altimeter/setting-inhg", oldqnh);
+		setprop("/modes/altimeter/std", 0);
+	} else if (Std == 0) {
+		var qnh = getprop("/instrumentation/altimeter/setting-inhg");
+		setprop("/modes/altimeter/oldqnh", qnh);
+		setprop("/instrumentation/altimeter/setting-inhg", 29.92);
+		setprop("/modes/altimeter/std", 1);
+	}
+}
+
+var increaseManVS = func {
+	var manvs = getprop("/systems/pressurization/outflowpos-man");
+	var auto = getprop("/systems/pressurization/auto");
+	if (manvs <= 1 and manvs >= 0 and !auto) {
+		setprop("/systems/pressurization/outflowpos-man", manvs + 0.001);
+	}
+}
+
+var decreaseManVS = func {
+	var manvs = getprop("/systems/pressurization/outflowpos-man");
+	var auto = getprop("/systems/pressurization/auto");
+	if (manvs <= 1 and manvs >= 0 and !auto) {
+		setprop("/systems/pressurization/outflowpos-man", manvs - 0.001);
+	}
+}
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index ff14a628..f2471cde 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -233,12 +233,13 @@ var librariesLoop = maketimer(0.1, func {
 	}
 });
 
-var variousReset = func {
-	setprop("/modes/cpt-du-xfr", 0);
-	setprop("/modes/fo-du-xfr", 0);
-	setprop("/controls/fadec/n1mode1", 0);
-	setprop("/controls/fadec/n1mode2", 0);
-}
+setlistener("/options/steep-ils", func {
+	if (getprop("/options/steep-ils") == 1) {
+		setprop("/instrumentation/mk-viii/inputs/discretes/steep-approach", 1);
+	} else {
+		setprop("/instrumentation/mk-viii/inputs/discretes/steep-approach", 0);
+	}
+});
 
 var aglgears = func {
     var agl = getprop("/position/altitude-agl-ft") or 0;
@@ -252,72 +253,6 @@ var aglgears = func {
 
 aglgears();
 
-var mcpSPDKnbPull = func {
-	setprop("/it-autoflight/input/spd-managed", 0);
-	fmgc.ManagedSPD.stop();
-	var ias = getprop("/instrumentation/airspeed-indicator/indicated-speed-kt");
-	var mach = getprop("/instrumentation/airspeed-indicator/indicated-mach");
-	if (getprop("/it-autoflight/input/kts-mach") == 0) {
-		if (ias >= 100 and ias <= 360) {
-			setprop("/it-autoflight/input/spd-kts", math.round(ias, 1));
-		} else if (ias < 100) {
-			setprop("/it-autoflight/input/spd-kts", 100);
-		} else if (ias > 360) {
-			setprop("/it-autoflight/input/spd-kts", 360);
-		}
-	} else if (getprop("/it-autoflight/input/kts-mach") == 1) {
-		if (mach >= 0.50 and mach <= 0.95) {
-			setprop("/it-autoflight/input/spd-kts", math.round(mach, 0.001));
-		} else if (mach < 0.50) {
-			setprop("/it-autoflight/input/spd-kts", 0.50);
-		} else if (mach > 0.95) {
-			setprop("/it-autoflight/input/spd-kts", 0.95);
-		}
-	}
-}
-
-var mcpSPDKnbPush = func {
-	if (getprop("/FMGC/internal/cruise-lvl-set") == 1 and getprop("/FMGC/internal/cost-index-set") == 1) {
-		setprop("/it-autoflight/input/spd-managed", 1);
-		fmgc.ManagedSPD.start();
-	} else {
-		gui.popupTip("Please make sure you have set a cruise altitude and cost index in the MCDU.");
-	}
-}
-
-var mcpHDGKnbPull = func {
-	var latmode = getprop("/it-autoflight/output/lat");
-	var showhdg = getprop("/it-autoflight/custom/show-hdg");
-	if (latmode == 0 or showhdg == 0) {
-		setprop("/it-autoflight/input/lat", 3);
-		setprop("/it-autoflight/custom/show-hdg", 1);
-	} else {
-		setprop("/it-autoflight/input/lat", 0);
-		setprop("/it-autoflight/custom/show-hdg", 1);
-	}
-}
-
-var mcpHDGKnbPush = func {
-	setprop("/it-autoflight/input/lat", 1);
-}
-
-var hdgInput = func {
-	var latmode = getprop("/it-autoflight/output/lat");
-	if (latmode != 0) {
-		setprop("/it-autoflight/custom/show-hdg", 1);
-		var hdgnow = getprop("/it-autoflight/input/hdg");
-		settimer(func {
-			var hdgnew = getprop("/it-autoflight/input/hdg");
-			var showhdg = getprop("/it-autoflight/custom/show-hdg");
-			if (hdgnow == hdgnew and latmode != 5 and showhdg == 1) {
-				settimer(func {
-					setprop("/it-autoflight/custom/show-hdg", 0);
-				}, 10);
-			}
-		}, 2);
-	}
-}
-
 # In air, flaps 1 is slats only. On ground, it is slats and flaps.
 
 setprop("/controls/flight/flap-lever", 0);
@@ -428,33 +363,3 @@ var flaptimer = maketimer(0.5, func {
 		flaptimer.stop();
 	}
 });
-
-var toggleSTD = func {
-	var Std = getprop("/modes/altimeter/std");
-	if (Std == 1) {
-		var oldqnh = getprop("/modes/altimeter/oldqnh");
-		setprop("/instrumentation/altimeter/setting-inhg", oldqnh);
-		setprop("/modes/altimeter/std", 0);
-	} else if (Std == 0) {
-		var qnh = getprop("/instrumentation/altimeter/setting-inhg");
-		setprop("/modes/altimeter/oldqnh", qnh);
-		setprop("/instrumentation/altimeter/setting-inhg", 29.92);
-		setprop("/modes/altimeter/std", 1);
-	}
-}
-
-var increaseManVS = func {
-	var manvs = getprop("/systems/pressurization/outflowpos-man");
-	var auto = getprop("/systems/pressurization/auto");
-	if (manvs <= 1 and manvs >= 0 and !auto) {
-		setprop("/systems/pressurization/outflowpos-man", manvs + 0.001);
-	}
-}
-
-var decreaseManVS = func {
-	var manvs = getprop("/systems/pressurization/outflowpos-man");
-	var auto = getprop("/systems/pressurization/auto");
-	if (manvs <= 1 and manvs >= 0 and !auto) {
-		setprop("/systems/pressurization/outflowpos-man", manvs - 0.001);
-	}
-}
\ No newline at end of file