diff --git a/Models/Instruments/Audio/Audio1.xml b/Models/Instruments/Audio/Audio1.xml
index 74431040..37392258 100644
--- a/Models/Instruments/Audio/Audio1.xml
+++ b/Models/Instruments/Audio/Audio1.xml
@@ -4,7 +4,7 @@
 
 <PropertyList>
 
-	<path>res/Audio.ac</path>
+	<!--<path>res/Audio.ac</path>-->
 
 	<!-- Headset show/hide on Audio Control Panel(click on body) -->
 	<animation>
diff --git a/Models/Instruments/Audio/Audio2.xml b/Models/Instruments/Audio/Audio2.xml
index 33d00d4d..3a2374f9 100644
--- a/Models/Instruments/Audio/Audio2.xml
+++ b/Models/Instruments/Audio/Audio2.xml
@@ -4,7 +4,7 @@
 
 <PropertyList>
 
-	<path>res/Audio1.ac</path>
+	<!--<path>res/Audio1.ac</path>-->
 
 	<!-- Headset show/hide on Audio Control Panel(click on body) -->
 	<animation>
diff --git a/Models/Instruments/MCDU/MCDU1.xml b/Models/Instruments/MCDU/MCDU1.xml
index dc8327d8..b35a930b 100644
--- a/Models/Instruments/MCDU/MCDU1.xml
+++ b/Models/Instruments/MCDU/MCDU1.xml
@@ -4,11 +4,11 @@
 
 <PropertyList>
 
-	<path>res/MCDU1.ac</path>
+	<!--<path>res/MCDU1.ac</path>-->
 	
 	<animation>
 		<type>pick</type>
-		<object-name>mcdu1.screen</object-name>
+		<object-name>mcdu1.screen.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -21,7 +21,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>KBMode.Toggle</object-name>
+		<object-name>KBMode.Toggle.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -39,7 +39,7 @@
 
 	<animation>
  		<type>material</type>
- 		<object-name>mcdu1.screen</object-name>
+ 		<object-name>mcdu1.screen.cpt</object-name>
  		<emission>
  			<red>1</red>
  			<green>1</green>
@@ -57,12 +57,12 @@
 			<dirt-factor>0.09</dirt-factor>
 			<contrast><use>instrumentation/mcdu/mcdu1-contrast</use></contrast>
 		</parameters>
-		<object-name>mcdu1.screen</object-name>
+		<object-name>mcdu1.screen.cpt</object-name>
 	</effect>
 
 	<animation>
 		<type>pick</type>
-		<object-name>BRT</object-name>
+		<object-name>BRT.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -85,7 +85,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>DIM</object-name>
+		<object-name>DIM.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -108,7 +108,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>radnav</object-name>
+		<object-name>radnav.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -133,7 +133,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>init</object-name>
+		<object-name>init.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -158,7 +158,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>data</object-name>
+		<object-name>data.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -183,7 +183,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>atc_comm</object-name>
+		<object-name>atc_comm.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -208,7 +208,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>mcdu</object-name>
+		<object-name>mcdu.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -233,7 +233,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>prog</object-name>
+		<object-name>prog.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -258,7 +258,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>perf</object-name>
+		<object-name>perf.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -283,7 +283,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>f-pln</object-name>
+		<object-name>f-pln.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -308,7 +308,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>fuel-pred</object-name>
+		<object-name>fuel-pred.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -333,7 +333,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>dir</object-name>
+		<object-name>dir.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -358,7 +358,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>L1</object-name>
+		<object-name>L1.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -402,7 +402,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>L2</object-name>
+		<object-name>L2.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -446,7 +446,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>L3</object-name>
+		<object-name>L3.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -490,7 +490,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>L4</object-name>
+		<object-name>L4.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -534,7 +534,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>L5</object-name>
+		<object-name>L5.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -578,7 +578,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>L6</object-name>
+		<object-name>L6.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -623,7 +623,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>R1</object-name>
+		<object-name>R1.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -667,7 +667,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>R2</object-name>
+		<object-name>R2.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -711,7 +711,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>R3</object-name>
+		<object-name>R3.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -755,7 +755,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>R4</object-name>
+		<object-name>R4.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -799,7 +799,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>R5</object-name>
+		<object-name>R5.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -843,7 +843,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>R6</object-name>
+		<object-name>R6.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -888,7 +888,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>airport</object-name>
+		<object-name>airport.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -913,7 +913,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>left</object-name>
+		<object-name>left.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -937,7 +937,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>right</object-name>
+		<object-name>right.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -961,7 +961,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>up</object-name>
+		<object-name>up.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -985,7 +985,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>down</object-name>
+		<object-name>down.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1010,7 +1010,7 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>a</object-name>
+		<object-name>a.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1034,7 +1034,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>b</object-name>
+		<object-name>b.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1058,7 +1058,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>c</object-name>
+		<object-name>c.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1082,7 +1082,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>d</object-name>
+		<object-name>d.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1106,7 +1106,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>e</object-name>
+		<object-name>e.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1130,7 +1130,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>f</object-name>
+		<object-name>f.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1154,7 +1154,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>g</object-name>
+		<object-name>g.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1178,7 +1178,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>h</object-name>
+		<object-name>h.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1202,7 +1202,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>i</object-name>
+		<object-name>i.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1226,7 +1226,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>j</object-name>
+		<object-name>j.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1250,7 +1250,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>k</object-name>
+		<object-name>k.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1274,7 +1274,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>l</object-name>
+		<object-name>l.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1298,7 +1298,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>m</object-name>
+		<object-name>m.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1322,7 +1322,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>n</object-name>
+		<object-name>n.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1346,7 +1346,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>o</object-name>
+		<object-name>o.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1370,7 +1370,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>p</object-name>
+		<object-name>p.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1394,7 +1394,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>q</object-name>
+		<object-name>q.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1418,7 +1418,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>r</object-name>
+		<object-name>r.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1442,7 +1442,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>s</object-name>
+		<object-name>s.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1466,7 +1466,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>t</object-name>
+		<object-name>t.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1490,7 +1490,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>u</object-name>
+		<object-name>u.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1514,7 +1514,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>v</object-name>
+		<object-name>v.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1538,7 +1538,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>w</object-name>
+		<object-name>w.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1562,7 +1562,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>x</object-name>
+		<object-name>x.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1586,7 +1586,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>y</object-name>
+		<object-name>y.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1610,7 +1610,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>z</object-name>
+		<object-name>z.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1634,7 +1634,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>/</object-name>
+		<object-name>/.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1658,7 +1658,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>sp</object-name>
+		<object-name>sp.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1682,7 +1682,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>overfly</object-name>
+		<object-name>overfly.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1706,7 +1706,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>clr</object-name>
+		<object-name>clr.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1748,7 +1748,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>0</object-name>
+		<object-name>0.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1772,7 +1772,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>1</object-name>
+		<object-name>1.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1796,7 +1796,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>2</object-name>
+		<object-name>2.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1820,7 +1820,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>3</object-name>
+		<object-name>3.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1844,7 +1844,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>4</object-name>
+		<object-name>4.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1868,7 +1868,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>5</object-name>
+		<object-name>5.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1892,7 +1892,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>6</object-name>
+		<object-name>6.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1916,7 +1916,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>7</object-name>
+		<object-name>7.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1940,7 +1940,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>8</object-name>
+		<object-name>8.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1964,7 +1964,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>9</object-name>
+		<object-name>9.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -1988,7 +1988,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>.</object-name>
+		<object-name>..cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -2012,7 +2012,7 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>+/-</object-name>
+		<object-name>+/-.cpt</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
@@ -2038,7 +2038,7 @@
 	<animation>
 		<name>Panel lighting</name>
 		<type>material</type>
-		<object-name>mcdu_body</object-name>
+		<object-name>mcdu_body.cpt</object-name>
 		<emission>
 			<red>0.3</red>
 			<green>0.3</green>
@@ -2049,12 +2049,12 @@
 	
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/Model/cockpit-irradiance</inherits-from>
-		<object-name>mcdu_body</object-name>
+		<object-name>mcdu_body.cpt</object-name>
 	</effect>
 	
 	<effect>
 		<inherits-from>Effects/model-transparent</inherits-from>
-		<object-name>mcdu_glare</object-name>
+		<object-name>mcdu_glare.cpt</object-name>
 	</effect>
 	
 </PropertyList>
diff --git a/Models/Instruments/MCDU/MCDU2.xml b/Models/Instruments/MCDU/MCDU2.xml
index 14bb2f38..61602cfd 100644
--- a/Models/Instruments/MCDU/MCDU2.xml
+++ b/Models/Instruments/MCDU/MCDU2.xml
@@ -4,11 +4,11 @@
 
 <PropertyList>
 
-	<path>res/MCDU2.ac</path>
+	<!--<path>res/MCDU2.ac</path>-->
 	
 	<animation>
 		<type>pick</type>
-		<object-name>mcdu2.screen</object-name>
+		<object-name>mcdu1.screen.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
@@ -21,30 +21,30 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>KBMode.Toggle</object-name>
+		<object-name>KBMode.Toggle.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>property-assign</command>
-				<property>/FMGC/keyboard-left</property>
+				<property>/FMGC/keyboard-right</property>
 				<value>0</value>
 			</binding>
 			<binding>
 				<command>property-toggle</command>
-				<property>/FMGC/keyboard-right</property>
+				<property>/FMGC/keyboard-left</property>
 			</binding>
 		</action>
 	</animation>
 
 	<animation>
  		<type>material</type>
- 		<object-name>mcdu2.screen</object-name>
+ 		<object-name>mcdu1.screen.fo</object-name>
  		<emission>
  			<red>1</red>
  			<green>1</green>
  			<blue>1</blue>
- 			<factor-prop>controls/lighting/DU/mcdu2</factor-prop>
+ 			<factor-prop>controls/lighting/DU/mcdu1</factor-prop>
  		</emission>
  	</animation>
 
@@ -55,26 +55,26 @@
 			<outer-angle>90</outer-angle> <!-- 0-90, but greater than inner -->
 			<black-angle>90</black-angle> <!-- 0-90, but greater than outer -->
 			<dirt-factor>0.09</dirt-factor>
-			<contrast><use>instrumentation/mcdu/mcdu2-contrast</use></contrast>
+			<contrast><use>instrumentation/mcdu/mcdu1-contrast</use></contrast>
 		</parameters>
-		<object-name>mcdu2.screen</object-name>
+		<object-name>mcdu1.screen.fo</object-name>
 	</effect>
 
 	<animation>
 		<type>pick</type>
-		<object-name>BRT</object-name>
+		<object-name>BRT.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
-						<property>systems/electrical/bus/ac-2</property>
+						<property>systems/electrical/bus/ac-1</property>
 						<value>110</value>
 					</greater-than-equals>
 				</condition>
 				<command>property-adjust</command>
-				<property>controls/lighting/DU/mcdu2</property>
+				<property>controls/lighting/DU/mcdu1</property>
 				<min>0.0</min>
 				<max>1.0</max>
 				<step>0.05</step>
@@ -85,19 +85,19 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>DIM</object-name>
+		<object-name>DIM.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
-						<property>systems/electrical/bus/ac-2</property>
+						<property>systems/electrical/bus/ac-1</property>
 						<value>110</value>
 					</greater-than-equals>
 				</condition>
 				<command>property-adjust</command>
-				<property>controls/lighting/DU/mcdu2</property>
+				<property>controls/lighting/DU/mcdu1</property>
 				<min>0.0</min>
 				<max>1.0</max>
 				<step>-0.05</step>
@@ -108,21 +108,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>radnav</object-name>
+		<object-name>radnav.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.pagebutton("radnav", 1);</script>
+				<script>mcdu.pagebutton("radnav", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -133,21 +133,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>init</object-name>
+		<object-name>init.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.pagebutton("init", 1);</script>
+				<script>mcdu.pagebutton("init", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -158,21 +158,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>data</object-name>
+		<object-name>data.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.pagebutton("data", 1);</script>
+				<script>mcdu.pagebutton("data", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -183,21 +183,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>atc_comm</object-name>
+		<object-name>atc_comm.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.pagebutton("atc", 1);</script>
+				<script>mcdu.pagebutton("atc", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -208,21 +208,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>mcdu</object-name>
+		<object-name>mcdu.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.pagebutton("mcdu", 1);</script>
+				<script>mcdu.pagebutton("mcdu", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -233,21 +233,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>prog</object-name>
+		<object-name>prog.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.pagebutton("prog", 1);</script>
+				<script>mcdu.pagebutton("prog", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -258,21 +258,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>perf</object-name>
+		<object-name>perf.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.pagebutton("perf", 1);</script>
+				<script>mcdu.pagebutton("perf", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -283,21 +283,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>f-pln</object-name>
+		<object-name>f-pln.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.pagebutton("f-pln", 1);</script>
+				<script>mcdu.pagebutton("f-pln", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -308,21 +308,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>fuel-pred</object-name>
+		<object-name>fuel-pred.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.pagebutton("fuel-pred", 1);</script>
+				<script>mcdu.pagebutton("fuel-pred", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -333,21 +333,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>dir</object-name>
+		<object-name>dir.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.pagebutton("dirto", 1);</script>
+				<script>mcdu.pagebutton("dirto", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -358,21 +358,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>L1</object-name>
+		<object-name>L1.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.lskbutton("1", 1);</script>
+				<script>mcdu.lskbutton("1", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -384,15 +384,15 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.lskbutton_b("1", 1);</script>
+				<script>mcdu.lskbutton_b("1", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -402,21 +402,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>L2</object-name>
+		<object-name>L2.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.lskbutton("2", 1);</script>
+				<script>mcdu.lskbutton("2", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -428,15 +428,15 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.lskbutton_b("2", 1);</script>
+				<script>mcdu.lskbutton_b("2", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -446,21 +446,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>L3</object-name>
+		<object-name>L3.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.lskbutton("3", 1);</script>
+				<script>mcdu.lskbutton("3", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -472,15 +472,15 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.lskbutton_b("3", 1);</script>
+				<script>mcdu.lskbutton_b("3", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -490,21 +490,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>L4</object-name>
+		<object-name>L4.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.lskbutton("4", 1);</script>
+				<script>mcdu.lskbutton("4", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -516,15 +516,15 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.lskbutton_b("4", 1);</script>
+				<script>mcdu.lskbutton_b("4", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -534,21 +534,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>L5</object-name>
+		<object-name>L5.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.lskbutton("5", 1);</script>
+				<script>mcdu.lskbutton("5", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -560,15 +560,15 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.lskbutton_b("5", 1);</script>
+				<script>mcdu.lskbutton_b("5", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -578,21 +578,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>L6</object-name>
+		<object-name>L6.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.lskbutton("6", 1);</script>
+				<script>mcdu.lskbutton("6", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -604,15 +604,15 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.lskbutton_b("6", 1);</script>
+				<script>mcdu.lskbutton_b("6", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -623,21 +623,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>R1</object-name>
+		<object-name>R1.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.rskbutton("1", 1);</script>
+				<script>mcdu.rskbutton("1", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -649,15 +649,15 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.rskbutton_b("1", 1);</script>
+				<script>mcdu.rskbutton_b("1", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -667,21 +667,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>R2</object-name>
+		<object-name>R2.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.rskbutton("2", 1);</script>
+				<script>mcdu.rskbutton("2", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -693,15 +693,15 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.rskbutton_b("2", 1);</script>
+				<script>mcdu.rskbutton_b("2", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -711,21 +711,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>R3</object-name>
+		<object-name>R3.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.rskbutton("3", 1);</script>
+				<script>mcdu.rskbutton("3", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -737,15 +737,15 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.rskbutton_b("3", 1);</script>
+				<script>mcdu.rskbutton_b("3", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -755,21 +755,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>R4</object-name>
+		<object-name>R4.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.rskbutton("4", 1);</script>
+				<script>mcdu.rskbutton("4", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -781,15 +781,15 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.rskbutton_b("4", 1);</script>
+				<script>mcdu.rskbutton_b("4", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -799,21 +799,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>R5</object-name>
+		<object-name>R5.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.rskbutton("5", 1);</script>
+				<script>mcdu.rskbutton("5", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -825,15 +825,15 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.rskbutton_b("5", 1);</script>
+				<script>mcdu.rskbutton_b("5", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -843,21 +843,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>R6</object-name>
+		<object-name>R6.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.rskbutton("6", 1);</script>
+				<script>mcdu.rskbutton("6", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -869,15 +869,15 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.rskbutton_b("6", 1);</script>
+				<script>mcdu.rskbutton_b("6", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -888,21 +888,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>airport</object-name>
+		<object-name>airport.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.pagebutton("airport", 1);</script>
+				<script>mcdu.pagebutton("airport", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -913,21 +913,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>left</object-name>
+		<object-name>left.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.arrowbutton("left", 1);</script>
+				<script>mcdu.arrowbutton("left", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -937,21 +937,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>right</object-name>
+		<object-name>right.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.arrowbutton("right", 1);</script>
+				<script>mcdu.arrowbutton("right", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -961,21 +961,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>up</object-name>
+		<object-name>up.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.arrowbutton("up", 1);</script>
+				<script>mcdu.arrowbutton("up", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -985,21 +985,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>down</object-name>
+		<object-name>down.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.arrowbutton("down", 1);</script>
+				<script>mcdu.arrowbutton("down", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1010,21 +1010,21 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>a</object-name>
+		<object-name>a.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("A", 1);</script>
+				<script>mcdu.button("A", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1034,21 +1034,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>b</object-name>
+		<object-name>b.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("B", 1);</script>
+				<script>mcdu.button("B", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1058,21 +1058,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>c</object-name>
+		<object-name>c.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("C", 1);</script>
+				<script>mcdu.button("C", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1082,21 +1082,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>d</object-name>
+		<object-name>d.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("D", 1);</script>
+				<script>mcdu.button("D", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1106,21 +1106,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>e</object-name>
+		<object-name>e.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("E", 1);</script>
+				<script>mcdu.button("E", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1130,21 +1130,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>f</object-name>
+		<object-name>f.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("F", 1);</script>
+				<script>mcdu.button("F", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1154,21 +1154,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>g</object-name>
+		<object-name>g.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("G", 1);</script>
+				<script>mcdu.button("G", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1178,21 +1178,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>h</object-name>
+		<object-name>h.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("H", 1);</script>
+				<script>mcdu.button("H", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1202,21 +1202,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>i</object-name>
+		<object-name>i.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("I", 1);</script>
+				<script>mcdu.button("I", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1226,21 +1226,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>j</object-name>
+		<object-name>j.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("J", 1);</script>
+				<script>mcdu.button("J", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1250,21 +1250,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>k</object-name>
+		<object-name>k.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("K", 1);</script>
+				<script>mcdu.button("K", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1274,21 +1274,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>l</object-name>
+		<object-name>l.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("L", 1);</script>
+				<script>mcdu.button("L", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1298,21 +1298,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>m</object-name>
+		<object-name>m.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("M", 1);</script>
+				<script>mcdu.button("M", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1322,21 +1322,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>n</object-name>
+		<object-name>n.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("N", 1);</script>
+				<script>mcdu.button("N", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1346,21 +1346,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>o</object-name>
+		<object-name>o.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("O", 1);</script>
+				<script>mcdu.button("O", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1370,21 +1370,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>p</object-name>
+		<object-name>p.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("P", 1);</script>
+				<script>mcdu.button("P", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1394,21 +1394,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>q</object-name>
+		<object-name>q.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("Q", 1);</script>
+				<script>mcdu.button("Q", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1418,21 +1418,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>r</object-name>
+		<object-name>r.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("R", 1);</script>
+				<script>mcdu.button("R", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1442,21 +1442,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>s</object-name>
+		<object-name>s.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("S", 1);</script>
+				<script>mcdu.button("S", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1466,21 +1466,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>t</object-name>
+		<object-name>t.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("T", 1);</script>
+				<script>mcdu.button("T", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1490,21 +1490,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>u</object-name>
+		<object-name>u.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("U", 1);</script>
+				<script>mcdu.button("U", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1514,21 +1514,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>v</object-name>
+		<object-name>v.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("V", 1);</script>
+				<script>mcdu.button("V", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1538,21 +1538,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>w</object-name>
+		<object-name>w.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("W", 1);</script>
+				<script>mcdu.button("W", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1562,21 +1562,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>x</object-name>
+		<object-name>x.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("X", 1);</script>
+				<script>mcdu.button("X", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1586,21 +1586,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>y</object-name>
+		<object-name>y.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("Y", 1);</script>
+				<script>mcdu.button("Y", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1610,21 +1610,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>z</object-name>
+		<object-name>z.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("Z", 1);</script>
+				<script>mcdu.button("Z", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1634,21 +1634,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>/</object-name>
+		<object-name>/.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("SLASH", 1);</script>
+				<script>mcdu.button("SLASH", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1658,21 +1658,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>sp</object-name>
+		<object-name>sp.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("SP", 1);</script>
+				<script>mcdu.button("SP", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1682,21 +1682,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>overfly</object-name>
+		<object-name>overfly.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("OVFY", 1);</script>
+				<script>mcdu.button("OVFY", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1706,21 +1706,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>clr</object-name>
+		<object-name>clr.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("CLR", 1, "down");</script>
+				<script>mcdu.button("CLR", 0, "down");</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1729,15 +1729,15 @@
 			<mod-up>
 				<binding>
 					<command>nasal</command>
-					<script>mcdu.button("CLR", 1, "up");</script>
+					<script>mcdu.button("CLR", 0, "up");</script>
 					<condition>
 						<and>
 							<greater-than-equals>
-								<property>systems/electrical/bus/ac-2</property>
+								<property>systems/electrical/bus/ac-1</property>
 								<value>110</value>
 							</greater-than-equals>
 							<greater-than>
-								<property>controls/lighting/DU/mcdu2</property>
+								<property>controls/lighting/DU/mcdu1</property>
 								<value>0.01</value>
 							</greater-than>
 						</and>
@@ -1748,21 +1748,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>0</object-name>
+		<object-name>0.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("0", 1);</script>
+				<script>mcdu.button("0", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1772,21 +1772,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>1</object-name>
+		<object-name>1.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("1", 1);</script>
+				<script>mcdu.button("1", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1796,21 +1796,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>2</object-name>
+		<object-name>2.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("2", 1);</script>
+				<script>mcdu.button("2", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1820,21 +1820,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>3</object-name>
+		<object-name>3.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("3", 1);</script>
+				<script>mcdu.button("3", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1844,21 +1844,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>4</object-name>
+		<object-name>4.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("4", 1);</script>
+				<script>mcdu.button("4", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1868,21 +1868,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>5</object-name>
+		<object-name>5.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("5", 1);</script>
+				<script>mcdu.button("5", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1892,21 +1892,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>6</object-name>
+		<object-name>6.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("6", 1);</script>
+				<script>mcdu.button("6", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1916,21 +1916,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>7</object-name>
+		<object-name>7.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("7", 1);</script>
+				<script>mcdu.button("7", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1940,21 +1940,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>8</object-name>
+		<object-name>8.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("8", 1);</script>
+				<script>mcdu.button("8", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1964,21 +1964,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>9</object-name>
+		<object-name>9.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("9", 1);</script>
+				<script>mcdu.button("9", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -1988,21 +1988,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>.</object-name>
+		<object-name>..fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("DOT", 1);</script>
+				<script>mcdu.button("DOT", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -2012,21 +2012,21 @@
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>+/-</object-name>
+		<object-name>+/-.fo</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu.button("PLUSMINUS", 1);</script>
+				<script>mcdu.button("PLUSMINUS", 0);</script>
 				<condition>
 					<and>
 						<greater-than-equals>
-							<property>systems/electrical/bus/ac-2</property>
+							<property>systems/electrical/bus/ac-1</property>
 							<value>110</value>
 						</greater-than-equals>
 						<greater-than>
-							<property>controls/lighting/DU/mcdu2</property>
+							<property>controls/lighting/DU/mcdu1</property>
 							<value>0.01</value>
 						</greater-than>
 					</and>
@@ -2038,7 +2038,7 @@
 	<animation>
 		<name>Panel lighting</name>
 		<type>material</type>
-		<object-name>mcdu_body</object-name>
+		<object-name>mcdu_body.fo</object-name>
 		<emission>
 			<red>0.3</red>
 			<green>0.3</green>
@@ -2049,12 +2049,12 @@
 	
 	<effect>
 		<inherits-from>Aircraft/A320-family/Models/Effects/Model/cockpit-irradiance</inherits-from>
-		<object-name>mcdu_body</object-name>
+		<object-name>mcdu_body.fo</object-name>
 	</effect>
 	
 	<effect>
 		<inherits-from>Effects/model-transparent</inherits-from>
-		<object-name>mcdu_glare</object-name>
+		<object-name>mcdu_glare.fo</object-name>
 	</effect>
 	
 </PropertyList>
diff --git a/Models/Instruments/Radio/Radio1.xml b/Models/Instruments/Radio/Radio1.xml
index b5a7a7b0..e6b54161 100644
--- a/Models/Instruments/Radio/Radio1.xml
+++ b/Models/Instruments/Radio/Radio1.xml
@@ -8,7 +8,7 @@
 
 <PropertyList>
 
-	<path>res/Radio.ac</path>
+	<!--<path>res/Radio.ac</path>-->
 
 	<!-- On Switch -->
 	<animation>
diff --git a/Models/Instruments/Radio/Radio2.xml b/Models/Instruments/Radio/Radio2.xml
index 0f3fd0c3..9fd2a1e0 100644
--- a/Models/Instruments/Radio/Radio2.xml
+++ b/Models/Instruments/Radio/Radio2.xml
@@ -8,7 +8,7 @@
 
 <PropertyList>
 
-	<path>res/Radio1.ac</path>
+	<!--<path>res/Radio.ac</path>-->
 
 	<!-- On Switch -->
 	<animation>