diff --git a/A320-main.xml b/A320-main.xml
index e0a5dceb..3a955fc7 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -694,6 +694,10 @@
 			<windowprobeheat type="double">0.5</windowprobeheat>
 			<qnh-knb>100000</qnh-knb>
 			<strobe type="double">0.0</strobe>
+			<beacon type="bool">0</beacon>
+			<wing-lights type="bool">0</wing-lights>
+			<landing-lights-l type="float">0.0</landing-lights-l>
+			<landing-lights-r type="float">0.0</landing-lights-r>
 		</switches>
 		<tray n="0">
 			<lefttrayext type="double">0</lefttrayext>
diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index c175a83c..655d0fc8 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -344,7 +344,7 @@ var beforestart_b = func {
 	systems.ADIRS.skip(1);
 	systems.ADIRS.skip(2);
 	setprop("/controls/adirs/mcducbtn", 1);
-	setprop("/controls/lighting/beacon", 1);
+	setprop("/controls/switches/beacon", 1);
 	setprop("/controls/lighting/nav-lights-switch", 1);
 	setprop("/controls/radio/rmp[0]/on", 1);
 	setprop("/controls/radio/rmp[1]/on", 1);
@@ -430,8 +430,8 @@ var taxi_b = func {
 	setprop("/controls/radio/rmp[1]/on", 1);
 	setprop("/controls/radio/rmp[2]/on", 1);
 	setprop("/controls/lighting/taxi-light-switch", 0.5);
-	setprop("/controls/lighting/landing-lights[1]", 0.5);
-	setprop("/controls/lighting/landing-lights[2]", 0.5);
+	setprop("/controls/switches/landing-lights-l", 0.5);
+	setprop("/controls/switches/landing-lights-r", 0.5);
 	settimer(taxi_c, 2);
 }
 var taxi_c = func {
@@ -466,8 +466,8 @@ var takeoff = func {
 				removelistener(eng_one_chk_c);
 				setprop("/controls/switches/strobe", 0.5);
 				setprop("/controls/lighting/taxi-light-switch", 1);
-				setprop("/controls/lighting/landing-lights[1]", 1);
-				setprop("/controls/lighting/landing-lights[2]", 1);
+				setprop("/controls/switches/landing-lights-l", 1);
+				setprop("/controls/switches/landing-lights-r", 1);
 				setprop("/controls/flight/speedbrake-arm", 1);
 				setprop("/controls/flight/flaps", 0.290);
 				setprop("/controls/flight/slats", 0.666);
diff --git a/Models/Instruments/MCDU/MCDU1.xml b/Models/Instruments/MCDU/MCDU1.xml
index 846bf4f0..afb1e4db 100644
--- a/Models/Instruments/MCDU/MCDU1.xml
+++ b/Models/Instruments/MCDU/MCDU1.xml
@@ -35,7 +35,7 @@
 		<object-name>BRT</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -58,7 +58,7 @@
 		<object-name>DIM</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -81,7 +81,7 @@
 		<object-name>radnav</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("radnav", 0);</script>
@@ -106,7 +106,7 @@
 		<object-name>init</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("init", 0);</script>
@@ -131,7 +131,7 @@
 		<object-name>data</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("data", 0);</script>
@@ -156,7 +156,7 @@
 		<object-name>mcdu</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("mcdu", 0);</script>
@@ -181,7 +181,7 @@
 		<object-name>perf</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("perf", 0);</script>
@@ -206,7 +206,7 @@
 		<object-name>f-pln</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("f-pln", 0);</script>
@@ -231,7 +231,7 @@
 		<object-name>fuel-pred</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("fuel-pred", 0);</script>
@@ -256,7 +256,7 @@
 		<object-name>L1</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton("1", 0);</script>
@@ -276,7 +276,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton_b("1", 0);</script>
@@ -300,7 +300,7 @@
 		<object-name>L2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton("2", 0);</script>
@@ -320,7 +320,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton_b("2", 0);</script>
@@ -344,7 +344,7 @@
 		<object-name>L3</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton("3", 0);</script>
@@ -364,7 +364,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton_b("3", 0);</script>
@@ -388,7 +388,7 @@
 		<object-name>L4</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton("4", 0);</script>
@@ -408,7 +408,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton_b("4", 0);</script>
@@ -432,7 +432,7 @@
 		<object-name>L5</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton("5", 0);</script>
@@ -452,7 +452,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton_b("5", 0);</script>
@@ -476,7 +476,7 @@
 		<object-name>L6</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton("6", 0);</script>
@@ -496,7 +496,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton_b("6", 0);</script>
@@ -521,7 +521,7 @@
 		<object-name>R1</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton("1", 0);</script>
@@ -541,7 +541,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton_b("1", 0);</script>
@@ -565,7 +565,7 @@
 		<object-name>R2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton("2", 0);</script>
@@ -585,7 +585,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton_b("2", 0);</script>
@@ -609,7 +609,7 @@
 		<object-name>R3</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton("3", 0);</script>
@@ -629,7 +629,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton_b("3", 0);</script>
@@ -653,7 +653,7 @@
 		<object-name>R4</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton("4", 0);</script>
@@ -673,7 +673,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton_b("4", 0);</script>
@@ -697,7 +697,7 @@
 		<object-name>R5</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton("5", 0);</script>
@@ -717,7 +717,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton_b("5", 0);</script>
@@ -741,7 +741,7 @@
 		<object-name>R6</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton("6", 0);</script>
@@ -761,7 +761,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton_b("6", 0);</script>
@@ -786,7 +786,7 @@
 		<object-name>left</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.arrowbutton("left", 0);</script>
@@ -810,7 +810,7 @@
 		<object-name>right</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.arrowbutton("right", 0);</script>
@@ -834,7 +834,7 @@
 		<object-name>up</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.arrowbutton("up", 0);</script>
@@ -858,7 +858,7 @@
 		<object-name>down</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.arrowbutton("down", 0);</script>
diff --git a/Models/Instruments/MCDU/MCDU2.xml b/Models/Instruments/MCDU/MCDU2.xml
index 2aad6056..6bace350 100644
--- a/Models/Instruments/MCDU/MCDU2.xml
+++ b/Models/Instruments/MCDU/MCDU2.xml
@@ -35,7 +35,7 @@
 		<object-name>BRT</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -58,7 +58,7 @@
 		<object-name>DIM</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -81,7 +81,7 @@
 		<object-name>radnav</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("radnav", 1);</script>
@@ -106,7 +106,7 @@
 		<object-name>init</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("init", 1);</script>
@@ -131,7 +131,7 @@
 		<object-name>data</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("data", 1);</script>
@@ -156,7 +156,7 @@
 		<object-name>mcdu</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("mcdu", 1);</script>
@@ -181,7 +181,7 @@
 		<object-name>perf</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("perf", 1);</script>
@@ -206,7 +206,7 @@
 		<object-name>f-pln</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("f-pln", 1);</script>
@@ -231,7 +231,7 @@
 		<object-name>fuel-pred</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.pagebutton("fuel-pred", 1);</script>
@@ -256,7 +256,7 @@
 		<object-name>L1</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton("1", 1);</script>
@@ -276,7 +276,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton_b("1", 1);</script>
@@ -300,7 +300,7 @@
 		<object-name>L2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton("2", 1);</script>
@@ -320,7 +320,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton_b("2", 1);</script>
@@ -344,7 +344,7 @@
 		<object-name>L3</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton("3", 1);</script>
@@ -364,7 +364,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton_b("3", 1);</script>
@@ -388,7 +388,7 @@
 		<object-name>L4</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton("4", 1);</script>
@@ -408,7 +408,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton_b("4", 1);</script>
@@ -432,7 +432,7 @@
 		<object-name>L5</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton("5", 1);</script>
@@ -452,7 +452,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton_b("5", 1);</script>
@@ -476,7 +476,7 @@
 		<object-name>L6</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton("6", 1);</script>
@@ -496,7 +496,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.lskbutton_b("6", 1);</script>
@@ -521,7 +521,7 @@
 		<object-name>R1</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton("1", 1);</script>
@@ -541,7 +541,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton_b("1", 1);</script>
@@ -565,7 +565,7 @@
 		<object-name>R2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton("2", 1);</script>
@@ -585,7 +585,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton_b("2", 1);</script>
@@ -609,7 +609,7 @@
 		<object-name>R3</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton("3", 1);</script>
@@ -629,7 +629,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton_b("3", 1);</script>
@@ -653,7 +653,7 @@
 		<object-name>R4</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton("4", 1);</script>
@@ -673,7 +673,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton_b("4", 1);</script>
@@ -697,7 +697,7 @@
 		<object-name>R5</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton("5", 1);</script>
@@ -717,7 +717,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton_b("5", 1);</script>
@@ -741,7 +741,7 @@
 		<object-name>R6</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton("6", 1);</script>
@@ -761,7 +761,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.rskbutton_b("6", 1);</script>
@@ -786,7 +786,7 @@
 		<object-name>left</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.arrowbutton("left", 1);</script>
@@ -810,7 +810,7 @@
 		<object-name>right</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.arrowbutton("right", 1);</script>
@@ -834,7 +834,7 @@
 		<object-name>up</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.arrowbutton("up", 1);</script>
@@ -858,7 +858,7 @@
 		<object-name>down</object-name>
 		<action>
 			<button>0</button>
-			<repeatable>true</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>mcdu.arrowbutton("down", 1);</script>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index ee6d1b3f..02a32e9b 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -4680,7 +4680,7 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
-				<property>controls/lighting/beacon</property>
+				<property>controls/switches/beacon</property>
 			</binding>
 			<binding>
 				<command>nasal</command>
@@ -4692,7 +4692,7 @@
 		<name>Beacon lights rotate</name>
 		<type>rotate</type>
 		<object-name>BeaconLtSwtch</object-name>
-		<property>controls/lighting/beacon</property>
+		<property>controls/switches/beacon</property>
 		<interpolation>
 			<entry><ind>0</ind><dep>35</dep></entry>
 			<entry><ind>1</ind><dep>-35</dep></entry>
@@ -4718,7 +4718,7 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
-				<property>controls/lighting/wing-lights</property>
+				<property>controls/switches/wing-lights</property>
 			</binding>
 			<binding>
 				<command>nasal</command>
@@ -4730,7 +4730,7 @@
 		<name>Wing lights rotate</name>
 		<type>rotate</type>
 		<object-name>WingLtSwtch</object-name>
-		<property>controls/lighting/wing-lights</property>
+		<property>controls/switches/wing-lights</property>
 		<interpolation>
 			<entry><ind>0</ind><dep>35</dep></entry>
 			<entry><ind>1</ind><dep>-35</dep></entry>
@@ -4868,7 +4868,7 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
-				<property>controls/lighting/landing-lights[1]</property>
+				<property>controls/switches/landing-lights-l</property>
 				<value>0</value>
 				<value>0.5</value>
 				<value>1</value>
@@ -4883,7 +4883,7 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
-				<property>controls/lighting/landing-lights[1]</property>
+				<property>controls/switches/landing-lights-l</property>
 				<value>1</value>
 				<value>0.5</value>
 				<value>0</value>
@@ -4904,7 +4904,7 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
-				<property>controls/lighting/landing-lights[2]</property>
+				<property>controls/switches/landing-lights-r</property>
 				<value>0</value>
 				<value>0.5</value>
 				<value>1</value>
@@ -4919,7 +4919,7 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
-				<property>controls/lighting/landing-lights[2]</property>
+				<property>controls/switches/landing-lights-r</property>
 				<value>1</value>
 				<value>0.5</value>
 				<value>0</value>
@@ -4935,7 +4935,7 @@
 		<name>landing light rotate</name>
 		<type>rotate</type>
 		<object-name>LandingLtLSwtch</object-name>
-		<property>controls/lighting/landing-lights[1]</property>
+		<property>controls/switches/landing-lights-l</property>
 		<interpolation>
 			<entry><ind>0</ind><dep>35</dep></entry>
 			<entry><ind>1</ind><dep>-35</dep></entry>
@@ -4956,7 +4956,7 @@
 		<name>landing light rotate</name>
 		<type>rotate</type>
 		<object-name>LandingLtRSwtch</object-name>
-		<property>controls/lighting/landing-lights[2]</property>
+		<property>controls/switches/landing-lights-r</property>
 		<interpolation>
 			<entry><ind>0</ind><dep>35</dep></entry>
 			<entry><ind>1</ind><dep>-35</dep></entry>
diff --git a/Models/Lights/ALS/greennav.xml b/Models/Lights/ALS/greennav.xml
index f817bf79..a0a1fbd4 100644
--- a/Models/Lights/ALS/greennav.xml
+++ b/Models/Lights/ALS/greennav.xml
@@ -7,8 +7,6 @@
  <path>green-navlight.ac</path>
  <nopreview/>
 
-
-
  <effect>
    <inherits-from>Aircraft/IDG-A32X/Models/lights/ALS/green-navlight</inherits-from>
    <object-name>green-navlightals</object-name>
diff --git a/Models/Lights/greennav.xml b/Models/Lights/greennav.xml
index dd49f873..0c2b8962 100644
--- a/Models/Lights/greennav.xml
+++ b/Models/Lights/greennav.xml
@@ -13,10 +13,10 @@
 		<type>select</type>
 		<object-name>Light</object-name>
 		<condition>
-			<greater-than>
-				<property>controls/lighting/nav-lights-switch</property>
-				<value>0</value>
-			</greater-than>
+			<equals>
+				<property>/sim/model/lights/nav-lights</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 
diff --git a/Models/Lights/landing-nose.xml b/Models/Lights/landing-nose.xml
index ba342e38..e0325a0e 100644
--- a/Models/Lights/landing-nose.xml
+++ b/Models/Lights/landing-nose.xml
@@ -25,10 +25,16 @@
 		<object-name>Cone</object-name>
 		<condition>
 			<and>
-				<greater-than-equals>
-					<property>systems/electrical/bus/ac-ess</property>
-					<value>110</value>
-				</greater-than-equals>
+				<or>
+					<greater-than-equals>
+						<property>systems/electrical/bus/ac1</property>
+						<value>110</value>
+					</greater-than-equals>
+					<greater-than-equals>
+						<property>systems/electrical/bus/ac2</property>
+						<value>110</value>
+					</greater-than-equals>
+				</or>
 				<greater-than-equals>
 					<property>/sim/model/lights/nose-lights</property>
 					<value>0.5</value>
diff --git a/Models/Lights/landing-port.xml b/Models/Lights/landing-port.xml
index 66584fe6..b59898fb 100644
--- a/Models/Lights/landing-port.xml
+++ b/Models/Lights/landing-port.xml
@@ -26,7 +26,7 @@
 		<condition>
 			<and>
 				<greater-than-equals>
-					<property>systems/electrical/bus/ac-ess</property>
+					<property>systems/electrical/bus/ac1</property>
 					<value>110</value>
 				</greater-than-equals>
 				<property>controls/lighting/landing-lights[2]</property>
diff --git a/Models/Lights/landing-stbd.xml b/Models/Lights/landing-stbd.xml
index 59e22f55..f8f2a212 100644
--- a/Models/Lights/landing-stbd.xml
+++ b/Models/Lights/landing-stbd.xml
@@ -28,7 +28,7 @@
 		<condition>
 			<and>
 				<greater-than-equals>
-					<property>systems/electrical/bus/ac-ess</property>
+					<property>systems/electrical/bus/ac2</property>
 					<value>110</value>
 				</greater-than-equals>
 				<property>controls/lighting/landing-lights[2]</property>
diff --git a/Models/Lights/rednav.xml b/Models/Lights/rednav.xml
index 29441192..99e2937e 100644
--- a/Models/Lights/rednav.xml
+++ b/Models/Lights/rednav.xml
@@ -13,10 +13,10 @@
 		<type>select</type>
 		<object-name>Light</object-name>
 		<condition>
-			<greater-than>
-				<property>controls/lighting/nav-lights-switch</property>
-				<value>0</value>
-			</greater-than>
+			<equals>
+				<property>/sim/model/lights/nav-lights</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 
diff --git a/Models/Lights/tailnav.xml b/Models/Lights/tailnav.xml
index 2412f200..e99277d5 100644
--- a/Models/Lights/tailnav.xml
+++ b/Models/Lights/tailnav.xml
@@ -13,10 +13,10 @@
 		<type>select</type>
 		<object-name>Light</object-name>
 		<condition>
-			<greater-than>
-				<property>controls/lighting/nav-lights-switch</property>
-				<value>0</value>
-			</greater-than>
+			<equals>
+				<property>/sim/model/lights/nav-lights</property>
+				<value>1</value>
+			</equals>
 		</condition>
 	</animation>
 
diff --git a/Nasal/buttons.nas b/Nasal/buttons.nas
index 2327ecf1..9d34377a 100644
--- a/Nasal/buttons.nas
+++ b/Nasal/buttons.nas
@@ -35,6 +35,10 @@ var variousReset = func {
 	setprop("/controls/switches/wiperRspd", 0); # -1 = INTM 0 = OFF 1 = LO 2 = HI
 	setprop("/controls/lighting/strobe", 0);
 	setprop("/controls/lighting/beacon", 0);
+	setprop("/controls/switches/beacon", 0);
+	setprop("/controls/switches/wing-lights", 0);
+	setprop("/controls/switches/landing-lights-l", 0);
+	setprop("/controls/switches/landing-lights-r", 0);
 	setprop("/controls/lighting/wing-lights", 0);
 	setprop("/controls/lighting/nav-lights-switch", 0);
 	setprop("/controls/lighting/landing-lights[1]", 0);
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index f4de37fc..00aac91c 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -40,6 +40,7 @@ setprop("/engines/engine[1]/oil-qt-actual", qty2);
 ##########
 
 var beacon_switch = props.globals.getNode("/controls/switches/beacon", 1);
+var beacon_ctl = props.globals.getNode("/controls/lighting/beacon", 1);
 var beacon = aircraft.light.new("/sim/model/lights/beacon", [0.1, 1], "/controls/lighting/beacon");
 var strobe_switch = props.globals.getNode("/controls/switches/strobe", 1);
 var strobe_light = props.globals.getNode("/controls/lighting/strobe", 1);
@@ -47,6 +48,8 @@ var strobe = aircraft.light.new("/sim/model/lights/strobe", [0.05, 0.06, 0.05, 1
 var tail_strobe = aircraft.light.new("/sim/model/lights/tailstrobe", [0.1, 1], "/controls/lighting/strobe");
 var logo_lights = getprop("/sim/model/lights/logo-lights");
 var nav_lights = props.globals.getNode("/sim/model/lights/nav-lights");
+var wing_switch = props.globals.getNode("/controls/switches/wing-lights", 1);
+var wing_ctl = props.globals.getNode("/controls/lighting/wing-lights", 1);
 var dome_light = props.globals.initNode("/sim/model/lights/dome-light", 0.0, "DOUBLE");
 var wow = getprop("/gear/gear[2]/wow");
 var slats = getprop("/controls/flight/slats");
@@ -58,8 +61,10 @@ var settingT = getprop("/controls/lighting/taxi-light-switch");
 var settingTurnoff = getprop("/controls/lighting/turnoff-light-switch");
 var setting = getprop("/controls/lighting/nav-lights-switch");
 var domeSetting = getprop("/controls/lighting/dome-norm");
-var landl = getprop("/controls/lighting/landing-lights[1]");
-var landr = getprop("/controls/lighting/landing-lights[2]");
+var landL = props.globals.getNode("controls/lighting/landing-lights[1]", 1);
+var landR = props.globals.getNode("controls/lighting/landing-lights[2]", 1);
+var landlSw = props.globals.getNode("/controls/switches/landing-lights-l", 1);
+var landrSw = props.globals.getNode("/controls/switches/landing-lights-r", 1);
 
 ###################
 # Tire Smoke/Rain #
@@ -505,7 +510,7 @@ var lightsLoop = maketimer(0.2, func {
 	wow = getprop("/gear/gear[2]/wow");
 	slats = getprop("/controls/flight/slats");
 	
-	if (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0) {
+	if (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0  or getprop("/systems/electrical/bus/dc1") > 0 or getprop("/systems/electrical/bus/dc2") > 0) {
 		setprop("/systems/electrical/nav-lights-power", 1);
 	} else { 
 		setprop("/systems/electrical/nav-lights-power", 0);
@@ -540,15 +545,45 @@ var lightsLoop = maketimer(0.2, func {
 	# strobe
 	strobe_sw = strobe_switch.getValue();
 	
-	if (strobe_sw == 1) {
+	if (strobe_sw == 1 and getprop("/systems/electrical/bus/ac2") > 0) {
 		strobe_light.setValue(1);
-	} elsif (strobe_sw == 0.5 and getprop("/gear/gear[1]/wow") == 0 and getprop("/gear/gear[2]/wow") == 0) {
+	} elsif (strobe_sw == 0.5 and getprop("/gear/gear[1]/wow") == 0 and getprop("/gear/gear[2]/wow") == 0 and getprop("/systems/electrical/bus/ac2") > 0) {
 		# todo: use lgciu output 5
 		strobe_light.setValue(1);
 	} else {
 		strobe_light.setValue(0);
 	}
 	
+	# beacon
+	
+	if (beacon_switch.getValue() == 1 and (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0)) {
+		beacon_ctl.setValue(1);
+	} else {
+		beacon_ctl.setValue(0);
+	}
+	
+	# wing
+	
+	if (wing_switch.getValue() == 1 and (getprop("/systems/electrical/bus/ac1") > 0 or getprop("/systems/electrical/bus/ac2") > 0)) {
+		wing_ctl.setValue(1);
+	} else {
+		wing_ctl.setValue(0);
+	}
+	
+	# landL
+	
+	if (landlSw.getValue() == 1 and getprop("/systems/electrical/bus/ac1") > 0) {
+		landL.setValue(1);
+	} else {
+		landL.setValue(0);
+	}
+	
+	if (landrSw.getValue() == 1 and getprop("/systems/electrical/bus/ac2") > 0) {
+		landR.setValue(1);
+	} else {
+		landR.setValue(0);
+	}
+	
 	# signs
 	
 	if (getprop("/systems/pressurization/cabinalt-norm") > 11300) {
diff --git a/revision.txt b/revision.txt
index d797b348..7b854259 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4764
\ No newline at end of file
+4765
\ No newline at end of file