diff --git a/Docs/keyboard/map.tex b/Docs/keyboard/map.tex
index 6889b422b..2d0b38041 100644
--- a/Docs/keyboard/map.tex
+++ b/Docs/keyboard/map.tex
@@ -153,19 +153,19 @@
\k 64 @ Select second engine
\k 65 A Decrease speed-up
\k 66 B Toggle parking brake on or off
-\k 67 C \ac{bo105} Toggle doors; \ac{spitfire} Coffman starter cartridge indexer
+\k 67 C Catapult launch; \ac{bo105} Toggle doors; \ac{spitfire} Coffman starter cartridge indexer
\k 68 D \ac{spitfire} Door fold down
\k 69 E {}
-\k 70 F \ac{hunter|seahawk} Wing fold down; \ac{spitfire} Open canopy
+\k 70 F Wing fold down; \ac{spitfire} Open canopy
\k 71 G Gear down
\k 72 H Cycle HUD brightness; \ac{hunter|seahawk} Hook down; \ac{spitfire} Radiator flap down
\k 73 I Minimal HUD
\k 74 J \ac{hunter-2tanks} Jettison outer pylon stores
\k 75 K \ac{spitfire} Toggle gear warning
-\k 76 L \ac{hunter|seahawk} Seat down
+\k 76 L Launchbar arrest; \ac{hunter|seahawk} Seat down
\k 77 M Decrease warp; \ac{spitfire} Mixture weak
\k 78 N \ac{spitfire} Propeller course
-\k 79 O \ac{spitfire} Operate priming pump
+\k 79 O Arrester hook down; \ac{spitfire} Operate priming pump
\k 80 P Toggle panel
\k 81 Q \ac{T38} Fuel cutoff switch or lever
\k 82 R \ac{fokker100} Toggle thrust reverser; \ac{A320|MD11} Toggle cutoff on selected engine(s)
@@ -188,7 +188,7 @@
\k 99 c Toggle 3D/2D cockpit
\k 100 d \ac{AN-225|YF-23|A-10} Retract slats; \ac{spitfire} Door fold up
\k 101 e {}
-\k 102 f \ac{AN-225|YF-23|A-10} Extend slats; \ac{hunter|seahawk} Wing fold up; \ac{spitfire} Close canopy
+\k 102 f Wing fold up; \ac{AN-225|YF-23|A-10} Extend slats; \ac{spitfire} Close canopy
\k 103 g Gear Up
\k 104 h HUD master switch (cycle green/red/off); \ac{hunter|seahawk} Hook up; \ac{spitfire} Radiator flap up
\k 105 i Normal HUD
@@ -197,7 +197,7 @@
\k 108 l Toggle tail-wheel lock; \ac{hunter|seahawk} Seat up; \ac{spitfire} Dump fuel
\k 109 m Increase warp; \ac{spitfire} Mixture rich
\k 110 n \ac{spitfire} Propeller fine
-\k 111 o {}
+\k 111 o Arrester hook up
\k 112 p Toggle the pause state of the sim
\k 113 q {}
\k 114 r Activate the instant replay system
diff --git a/keyboard.xml b/keyboard.xml
index 1c6671335..9e43850fe 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -519,6 +519,33 @@ calculated by adding 256 to the GLUT key value in glut.h.
+
+ C
+ Catapult launch
+
+ property-assign
+ /controls/gear/catapult-launch-cmd
+ 1.0
+
+
+
+ property-assign
+ /controls/gear/catapult-launch-cmd
+ 0.0
+
+
+
+
+
+ F
+ Wing Fold Down.
+
+ property-assign
+ /controls/flight/wing-fold
+ 1.0
+
+
+
G
Gear down.
@@ -545,6 +572,23 @@ calculated by adding 256 to the GLUT key value in glut.h.
+
+ L
+ Launchbar arrest
+
+ property-assign
+ /controls/gear/launchbar
+ 1.0
+
+
+
+ property-assign
+ /controls/gear/launchbar
+ 0.0
+
+
+
+
M
Decrease warp.
@@ -555,6 +599,16 @@ calculated by adding 256 to the GLUT key value in glut.h.
+
+ O
+ Arrester hook down.
+
+ property-assign
+ /controls/gear/tailhook
+ 1.0
+
+
+
P
Toggle panel.
@@ -687,6 +741,16 @@ calculated by adding 256 to the GLUT key value in glut.h.
+
+ f
+ Wing Fold Up.
+
+ property-assign
+ /controls/flight/wing-fold
+ 0.0
+
+
+
g
Gear Up.
@@ -750,6 +814,16 @@ calculated by adding 256 to the GLUT key value in glut.h.
+
+ o
+ Arrester hook Up.
+
+ property-assign
+ controls/gear/tailhook
+ 0.0
+
+
+
p
Toggle the pause state of the sim.
diff --git a/preferences.xml b/preferences.xml
index 5e7b96f59..f1cb57bc2 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -291,6 +291,7 @@ Started September 2000 by David Megginson, david@megginson.com
true
+ nimitz_demo