diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index a332d690..6665fea6 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -85,7 +85,6 @@ setprop("/systems/acconfig/out-of-date", 0);
 setprop("/systems/acconfig/mismatch-code", "0x000");
 setprop("/systems/acconfig/mismatch-reason", "XX");
 setprop("/systems/acconfig/options/keyboard-mode", 0);
-setprop("/systems/acconfig/options/laptop-mode", 0);
 setprop("/systems/acconfig/options/adirs-skip", 0);
 setprop("/systems/acconfig/options/welcome-skip", 0);
 setprop("/systems/acconfig/options/no-rendering-warn", 0);
@@ -215,7 +214,6 @@ var renderingSettings = {
 var readSettings = func {
 	io.read_properties(getprop("/sim/fg-home") ~ "/Export/IDG-A32X-config.xml", "/systems/acconfig/options");
 	setprop("/options/system/keyboard-mode", getprop("/systems/acconfig/options/keyboard-mode"));
-	setprop("/options/system/laptop-mode", getprop("/systems/acconfig/options/laptop-mode"));
 	setprop("/controls/adirs/skip", getprop("/systems/acconfig/options/adirs-skip"));
 	setprop("/sim/model/autopush/route/show", getprop("/systems/acconfig/options/autopush/show-route"));
 	setprop("/sim/model/autopush/route/show-wingtip", getprop("/systems/acconfig/options/autopush/show-wingtip"));
@@ -224,7 +222,6 @@ var readSettings = func {
 
 var writeSettings = func {
 	setprop("/systems/acconfig/options/keyboard-mode", getprop("/options/system/keyboard-mode"));
-	setprop("/systems/acconfig/options/laptop-mode", getprop("/options/system/laptop-mode"));
 	setprop("/systems/acconfig/options/adirs-skip", getprop("/controls/adirs/skip"));
 	setprop("/systems/acconfig/options/autopush/show-route", getprop("/sim/model/autopush/route/show"));
 	setprop("/systems/acconfig/options/autopush/show-wingtip", getprop("/sim/model/autopush/route/show-wingtip"));
diff --git a/AircraftConfig/help.xml b/AircraftConfig/help.xml
index 1796ae8e..73d60ecd 100644
--- a/AircraftConfig/help.xml
+++ b/AircraftConfig/help.xml
@@ -49,11 +49,6 @@
 				<label>Keyboard Mode: Maps flight controls to number pad, and number rows, instead of view shortucts.</label>
 			</text>
 			
-			<text>
-				<halign>left</halign>
-				<label>Laptop Mode: Not implemented yet. When implemented, will allow easier operation on laptops.</label>
-			</text>
-			
 			<hrule/>
 			
 			<text>
diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml
index cabc623e..6cd32c12 100644
--- a/AircraftConfig/main.xml
+++ b/AircraftConfig/main.xml
@@ -380,29 +380,6 @@
 				<live>true</live>
 			</checkbox>
 			
-			<checkbox>
-				<label>Laptop Mode (See Aircraft Help)</label>
-				<halign>left</halign>
-				<enable>
-					<property>/systems/acconfig/extra-stuff</property>
-				</enable>
-				<property>/options/system/laptop-mode</property>
-				<binding>
-					<command>property-toggle</command>
-					<property>/options/system/laptop-mode</property>
-				</binding>
-				<binding>
-					<command>dialog-apply</command>
-				</binding>
-				<binding>
-					<command>nasal</command>
-					<script>
-					acconfig.writeSettings();
-					</script>
-				</binding>
-				<live>true</live>
-			</checkbox>
-			
 			<checkbox>
 				<label>ADIRS Aligns Instantly</label>
 				<halign>left</halign>
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 24145f0d..653300c6 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -503,7 +503,7 @@
 		<action>
 			<button>3</button>
 			<button>0</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -529,7 +529,7 @@
 		<action>
 			<button>4</button>
 			<button>1</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -569,7 +569,7 @@
 		<object-name>RudderTrimReset</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -599,11 +599,11 @@
 		<type type="string">number-value</type>
 		<format type="string">%2.1f</format>
 		<property>fdm/jsbsim/hydraulics/rudder/trim-cmd-deg</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.009</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -625,11 +625,11 @@
 		<type type="string">text-value</type>
 		<format type="string">-88.8</format>
 		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.009</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -663,7 +663,7 @@
 		<object-name>ParkBrk</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>controls/gear/brake-parking</property>
@@ -1202,7 +1202,7 @@
 		<object-name>ecam_sts</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1221,7 +1221,7 @@
 		<object-name>ecam_apu</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1240,7 +1240,7 @@
 		<object-name>ecam_bleed</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1259,7 +1259,7 @@
 		<object-name>ecam_press</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1278,7 +1278,7 @@
 		<object-name>ecam_elec</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1297,7 +1297,7 @@
 		<object-name>ecam_hyd</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1316,7 +1316,7 @@
 		<object-name>ecam_fuel</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1335,7 +1335,7 @@
 		<object-name>ecam_eng</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1354,7 +1354,7 @@
 		<object-name>ecam_cond</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1373,7 +1373,7 @@
 		<object-name>ecam_door</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1392,7 +1392,7 @@
 		<object-name>ecam_wheel</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1411,7 +1411,7 @@
 		<object-name>ecam_fctl</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1430,7 +1430,7 @@
 		<object-name>ecam_to_config</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1655,7 +1655,7 @@
 		<object-name>ecam_rcl</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1675,7 +1675,7 @@
 		<object-name>ecam_clr_r</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1749,7 +1749,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>controls/engines/engine-start-switch</property>
@@ -1761,7 +1761,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>controls/engines/engine-start-switch</property>
@@ -1795,7 +1795,7 @@
 		<action>
 			<button>0</button>
 			<button>1</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -1811,7 +1811,7 @@
 		</action>
 		<action>
 			<button>3</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -1867,7 +1867,7 @@
 		</action>
 		<action>
 			<button>4</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -1932,7 +1932,7 @@
 			<button>1</button>
 			<button>3</button>
 			<button>4</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>modes/altimeter/inhg</property>
@@ -2002,11 +2002,11 @@
 		<type type="string">number-value</type>
 		<format type="string">%2.2f</format>
 		<property>/instrumentation/altimeter/setting-inhg</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.009</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -2028,11 +2028,11 @@
 		<type type="string">number-value</type>
 		<format type="string">%2.2f</format>
 		<property>/instrumentation/altimeter/setting-inhg</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.009</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -2054,11 +2054,11 @@
 		<type type="string">number-value</type>
 		<format type="string">%2.0f</format>
 		<property>/instrumentation/altimeter/setting-hpa</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.009</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -2080,11 +2080,11 @@
 		<type type="string">number-value</type>
 		<format type="string">%2.0f</format>
 		<property>/instrumentation/altimeter/setting-hpa</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.009</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -2106,11 +2106,11 @@
 		<type type="string">text-value</type>
 		<format type="string">STD</format>
 		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.009</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -2132,11 +2132,11 @@
 		<type type="string">text-value</type>
 		<format type="string">STD</format>
 		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.009</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -2158,11 +2158,11 @@
 		<type type="string">text-value</type>
 		<format type="string">88.88</format>
 		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.009</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -2184,11 +2184,11 @@
 		<type type="string">text-value</type>
 		<format type="string">88.88</format>
 		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.009</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -2260,7 +2260,7 @@
 		<object-name>fd1</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -2292,7 +2292,7 @@
 		<object-name>ils</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -2327,7 +2327,7 @@
 		<object-name>ils2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -2362,7 +2362,7 @@
 		<object-name>fd2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -2395,7 +2395,7 @@
 		<object-name>cstr</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -2437,7 +2437,7 @@
 		<object-name>cstr.001</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -2479,7 +2479,7 @@
 		<object-name>wpt</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -2521,7 +2521,7 @@
 		<object-name>wpt.001</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -2563,7 +2563,7 @@
 		<object-name>vord</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -2605,7 +2605,7 @@
 		<object-name>vord.001</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -2647,7 +2647,7 @@
 		<object-name>ndb</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -2689,7 +2689,7 @@
 		<object-name>ndb.001</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -2731,7 +2731,7 @@
 		<object-name>arpt</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -2773,7 +2773,7 @@
 		<object-name>arpt.001</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<condition>
 					<greater-than-equals>
@@ -2816,7 +2816,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>libraries.setCptND(1);</script>
@@ -2825,7 +2825,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>libraries.setCptND(-1);</script>
@@ -2854,7 +2854,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>libraries.setFoND(1);</script>
@@ -2863,7 +2863,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>libraries.setFoND(-1);</script>
@@ -2892,7 +2892,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>libraries.setNDRange(0, 1);</script>
@@ -2901,7 +2901,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>libraries.setNDRange(0, -1);</script>
@@ -2931,7 +2931,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>libraries.setNDRange(1, 1);</script>
@@ -2940,7 +2940,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>libraries.setNDRange(1, -1);</script>
@@ -2969,7 +2969,7 @@
 		<object-name>vor-adf-1</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>instrumentation/efis[0]/input/lh-vor-adf</property>
@@ -2980,7 +2980,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>instrumentation/efis[0]/input/lh-vor-adf</property>
@@ -3009,7 +3009,7 @@
 		<object-name>vor-adf-1-right</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>instrumentation/efis[1]/input/lh-vor-adf</property>
@@ -3020,7 +3020,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>instrumentation/efis[1]/input/lh-vor-adf</property>
@@ -3049,7 +3049,7 @@
 		<object-name>vor-adf-2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>instrumentation/efis[0]/input/rh-vor-adf</property>
@@ -3060,7 +3060,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>instrumentation/efis[0]/input/rh-vor-adf</property>
@@ -3089,7 +3089,7 @@
 		<object-name>vor-adf-2-right</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>instrumentation/efis[1]/input/rh-vor-adf</property>
@@ -3100,7 +3100,7 @@
 		</action>
 		<action>
 			<button>1</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>instrumentation/efis[1]/input/rh-vor-adf</property>
@@ -3470,11 +3470,11 @@
 		<type type="string">number-value</type>
 		<format type="string">%3.0f</format>
 		<property>it-autoflight/input/spd-kts</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.008</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -3496,11 +3496,11 @@
 		<type type="string">number-value</type>
 		<format type="string">%0.3f</format>
 		<property>it-autoflight/input/spd-mach</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.008</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -3522,11 +3522,11 @@
 		<type type="string">text-value</type>
 		<format type="string">.888</format>
 		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.008</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -3548,11 +3548,11 @@
 		<type type="string">text-value</type>
 		<format type="string">%s</format>
 		<property>it-autoflight/input/hdg</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.008</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -3574,11 +3574,11 @@
 		<type type="string">text-value</type>
 		<format type="string">888</format>
 		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.008</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -3600,11 +3600,11 @@
 		<type type="string">text-value</type>
 		<format type="string">%s</format>
 		<property>it-autoflight/input/alt</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.008</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -3626,11 +3626,11 @@
 		<type type="string">text-value</type>
 		<format type="string">88888</format>
 		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.008</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -3652,11 +3652,11 @@
 		<type type="string">number-value</type>
 		<format type="string">%4.0f</format>
 		<property>it-autoflight/input/vs</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.008</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -3678,11 +3678,11 @@
 		<type type="string">number-value</type>
 		<format type="string">%2.1f</format>
 		<property>it-autoflight/input/fpa</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.008</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -3704,11 +3704,11 @@
 		<type type="string">text-value</type>
 		<format type="string">-8888</format>
 		<property>autopilot/servicable</property>
-		<truncate type="bool">false</truncate>
+		<truncate>false</truncate>
 		<font type="string">led.txf</font>
-		<draw-text type="bool">true</draw-text>
-		<draw-alignment type="bool">false</draw-alignment>
-		<draw-boundingbox type="bool">false</draw-boundingbox>
+		<draw-text>true</draw-text>
+		<draw-alignment>false</draw-alignment>
+		<draw-boundingbox>false</draw-boundingbox>
 		<character-size>0.008</character-size>
 		<font-resolution>
 			<width type="int">32</width>
@@ -3793,9 +3793,19 @@
 			<button>0</button>
 			<repeatable>true</repeatable>
 			<binding>
+				<condition>
+					<not><property>devices/status/keyboard/shift</property></not>
+				</condition>
 				<command>nasal</command>
 				<script>libraries.APPanel.SPDPush();</script>
 			</binding>
+			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
+				<command>nasal</command>
+				<script>libraries.APPanel.SPDPull();</script>
+			</binding>
 			<binding>
 				<command>nasal</command>
 				<script>setprop("/sim/sounde/btn1", 1);</script>
@@ -3817,9 +3827,19 @@
 			<button>3</button>
 			<repeatable>true</repeatable>
 			<binding>
+				<condition>
+					<not><property>devices/status/keyboard/shift</property></not>
+				</condition>
 				<command>nasal</command>
 				<script>libraries.APPanel.SPDAdjust(1);</script>
 			</binding>
+			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
+				<command>nasal</command>
+				<script>libraries.APPanel.SPDAdjust(10);</script>
+			</binding>
 			<binding>
 				<command>property-adjust</command>
 				<property>it-autoflight/custom/spd-knb</property>
@@ -3833,9 +3853,19 @@
 			<button>4</button>
 			<repeatable>true</repeatable>
 			<binding>
+				<condition>
+					<not><property>devices/status/keyboard/shift</property></not>
+				</condition>
 				<command>nasal</command>
 				<script>libraries.APPanel.SPDAdjust(-1);</script>
 			</binding>
+			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
+				<command>nasal</command>
+				<script>libraries.APPanel.SPDAdjust(-10);</script>
+			</binding>
 			<binding>
 				<command>property-adjust</command>
 				<property>it-autoflight/custom/spd-knb</property>
@@ -3854,9 +3884,19 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<not><property>devices/status/keyboard/shift</property></not>
+				</condition>
 				<command>nasal</command>
 				<script>libraries.APPanel.HDGPush();</script>
 			</binding>
+			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
+				<command>nasal</command>
+				<script>libraries.APPanel.HDGPull();</script>
+			</binding>
 			<binding>
 				<command>nasal</command>
 				<script>setprop("/sim/sounde/btn1", 1);</script>
@@ -3878,9 +3918,19 @@
 			<button>3</button>
 			<repeatable>true</repeatable>
 			<binding>
+				<condition>
+					<not><property>devices/status/keyboard/shift</property></not>
+				</condition>
 				<command>nasal</command>
 				<script>libraries.APPanel.HDGAdjust(1);</script>
 			</binding>
+			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
+				<command>nasal</command>
+				<script>libraries.APPanel.HDGAdjust(10);</script>
+			</binding>
 			<binding>
 				<command>property-adjust</command>
 				<property>it-autoflight/custom/hdg-knb</property>
@@ -3894,9 +3944,19 @@
 			<button>4</button>
 			<repeatable>true</repeatable>
 			<binding>
+				<condition>
+					<not><property>devices/status/keyboard/shift</property></not>
+				</condition>
 				<command>nasal</command>
 				<script>libraries.APPanel.HDGAdjust(-1);</script>
 			</binding>
+			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
+				<command>nasal</command>
+				<script>libraries.APPanel.HDGAdjust(-10);</script>
+			</binding>
 			<binding>
 				<command>property-adjust</command>
 				<property>it-autoflight/custom/hdg-knb</property>
@@ -4015,7 +4075,7 @@
 		<object-name>ap2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -4081,9 +4141,19 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<not><property>devices/status/keyboard/shift</property></not>
+				</condition>
 				<command>nasal</command>
 				<script>libraries.APPanel.ALTPush();</script>
 			</binding>
+			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
+				<command>nasal</command>
+				<script>libraries.APPanel.ALTPull();</script>
+			</binding>
 			<binding>
 				<command>nasal</command>
 				<script>setprop("/sim/sounde/btn1", 1);</script>
@@ -4105,9 +4175,19 @@
 			<button>3</button>
 			<repeatable>true</repeatable>
 			<binding>
+				<condition>
+					<not><property>devices/status/keyboard/shift</property></not>
+				</condition>
 				<command>nasal</command>
 				<script>libraries.APPanel.ALTAdjust(1);</script>
 			</binding>
+			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
+				<command>nasal</command>
+				<script>libraries.APPanel.ALTAdjust(10);</script>
+			</binding>
 			<binding>
 				<command>property-adjust</command>
 				<property>it-autoflight/custom/alt-knb</property>
@@ -4121,9 +4201,19 @@
 			<button>4</button>
 			<repeatable>true</repeatable>
 			<binding>
+				<condition>
+					<not><property>devices/status/keyboard/shift</property></not>
+				</condition>
 				<command>nasal</command>
 				<script>libraries.APPanel.ALTAdjust(-1);</script>
 			</binding>
+			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
+				<command>nasal</command>
+				<script>libraries.APPanel.ALTAdjust(-10);</script>
+			</binding>
 			<binding>
 				<command>property-adjust</command>
 				<property>it-autoflight/custom/alt-knb</property>
@@ -4140,7 +4230,7 @@
 		<object-name>alt-sel-mode</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-toggle</command>
 				<property>it-autoflight/config/altitude-dial-mode</property>
@@ -4159,9 +4249,19 @@
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
+				<condition>
+					<not><property>devices/status/keyboard/shift</property></not>
+				</condition>
 				<command>nasal</command>
 				<script>libraries.APPanel.VSPush();</script>
 			</binding>
+			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
+				<command>nasal</command>
+				<script>libraries.APPanel.VSPull();</script>
+			</binding>
 			<binding>
 				<command>nasal</command>
 				<script>setprop("/sim/sounde/btn1", 1);</script>
@@ -4183,9 +4283,19 @@
 			<button>3</button>
 			<repeatable>true</repeatable>
 			<binding>
+				<condition>
+					<not><property>devices/status/keyboard/shift</property></not>
+				</condition>
 				<command>nasal</command>
 				<script>libraries.APPanel.VSAdjust(1);</script>
 			</binding>
+			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
+				<command>nasal</command>
+				<script>libraries.APPanel.VSAdjust(10);</script>
+			</binding>
 			<binding>
 				<command>property-adjust</command>
 				<property>it-autoflight/custom/vs-knb</property>
@@ -4199,9 +4309,19 @@
 			<button>4</button>
 			<repeatable>true</repeatable>
 			<binding>
+				<condition>
+					<not><property>devices/status/keyboard/shift</property></not>
+				</condition>
 				<command>nasal</command>
 				<script>libraries.APPanel.VSAdjust(-1);</script>
 			</binding>
+			<binding>
+				<condition>
+					<property>devices/status/keyboard/shift</property>
+				</condition>
+				<command>nasal</command>
+				<script>libraries.APPanel.VSAdjust(-10);</script>
+			</binding>
 			<binding>
 				<command>property-adjust</command>
 				<property>it-autoflight/custom/vs-knb</property>
@@ -4261,7 +4381,7 @@
 		<action>
 			<button>0</button>
 			<button>4</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>controls.flapsDown(1);</script>
@@ -4275,7 +4395,7 @@
 		<action>
 			<button>1</button>
 			<button>3</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>controls.flapsDown(-1);</script>
@@ -4311,7 +4431,7 @@
 		<object-name>footrest_cpt</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>libraries.l1Pedal();</script>
@@ -4339,7 +4459,7 @@
 		<object-name>footrest_cpt2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>libraries.l2Pedal();</script>
@@ -4367,7 +4487,7 @@
 		<object-name>footrest_fo</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>libraries.r1Pedal();</script>
@@ -4395,7 +4515,7 @@
 		<object-name>footrest_fo2</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>libraries.r2Pedal();</script>
@@ -5169,7 +5289,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
 				<property>/controls/flight/elevator-trim</property>
@@ -5179,7 +5299,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
 				<property>/controls/flight/elevator-trim</property>
@@ -5278,7 +5398,7 @@
 		<object-name>SpdBrk</object-name>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>property-assign</command>
 				<property>controls/flight/speedbrake</property>
@@ -5293,7 +5413,7 @@
 		</action>
 		<action>
 			<button>4</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -5315,7 +5435,7 @@
 		</action>
 		<action>
 			<button>3</button>
-			<repeatable type="bool">false</repeatable>
+			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -5565,7 +5685,7 @@
 		<object-name>tillerFo</object-name>
 		<action>
 			<button>3</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -5578,7 +5698,7 @@
 		</action>
 		<action>
 			<button>4</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -5591,7 +5711,7 @@
 		</action>
 		<action>
 			<button>0</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>nasal</command>
 				<script>
@@ -5627,7 +5747,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
 				<property>controls/engines/engine[0]/throttle</property>
@@ -5638,7 +5758,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
 				<property>controls/engines/engine[0]/throttle</property>
@@ -5702,7 +5822,7 @@
 		<action>
 			<button>0</button>
 			<button>3</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
 				<property>controls/engines/engine[1]/throttle</property>
@@ -5713,7 +5833,7 @@
 		<action>
 			<button>1</button>
 			<button>4</button>
-			<repeatable type="bool">true</repeatable>
+			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
 				<property>controls/engines/engine[1]/throttle</property>
diff --git a/revision.txt b/revision.txt
index 0946c8f1..86384b18 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4797
\ No newline at end of file
+4798
\ No newline at end of file