diff --git a/Docs/keyboard/map.pdf b/Docs/keyboard/map.pdf
index 81b0d3dc0..4da5e64d6 100644
Binary files a/Docs/keyboard/map.pdf and b/Docs/keyboard/map.pdf differ
diff --git a/Docs/keyboard/map.tex b/Docs/keyboard/map.tex
index 0bc55b031..a9d7bc504 100644
--- a/Docs/keyboard/map.tex
+++ b/Docs/keyboard/map.tex
@@ -13,6 +13,7 @@
 \pagestyle{empty}
 \setlength\parskip{0pt}
 \setlength\parindent{0pt}
+\linepenalty100
 
 \definecolor{darkcyan}{rgb}{0,.5,.5}
 \definecolor{darkred}{rgb}{.5,0,0}
@@ -75,7 +76,7 @@
 
 \renewcommand\|{$\backslash$}
 \newcommand\tld{\char`\~}
-\newcommand\ac[1]{\textcolor{darkcyan}{\textbf{\textsf{#1:}}}\nobreak}
+\newcommand\ac[1]{\penalty-10\textcolor{darkcyan}{\textbf{\textsf{#1:}}}\nobreak}
 \newcommand\hardcoded[1]{\textcolor{red}{hard-coded: #1}}
 \newcommand\shift[1]{\if$#1$\else\hfill\break\textcolor{darkblue}{SHIFT: #1}\fi}
 \newcommand\local[1]{\textcolor{darkred}{local: #1}}
@@ -87,37 +88,37 @@
 
 \begin{keyboard}
 \k 1	Ctrl-A		Toggle autopilot altitude lock
-\k 2	Ctrl-B		Toggle speedbrake; \ac{hunter|seahawk} Toggle speedbrake; \ac{p51d} Toggle engine boost
+\k 2	Ctrl-B		Toggle speedbrake; \ac{hunter|seahawk} Toggle speedbrake; \ac{p51d} Toggle engine boost; \ac{Concorde} Toggle afterburner
 \k 3	Ctrl-C		Toggle clickable panel hotspots
-\k 4	Ctrl-D		{}
+\k 4	Ctrl-D		\ac{spitfire} Door fold toggle
 \k 5	Ctrl-E		{}
 \k 6	Ctrl-F		\ac{hunter|seahawk} Emergency flap lowering
 \k 7	Ctrl-G		Toggle autopilot glide slope lock
 \k 8	Ctrl-H		Toggle autopilot heading lock
 \k 9	Ctrl-I/Tab	Show instrument setting dialog
-\k 10	Ctrl-J		\ac{hunter} Jettison inner and outer pylon stores
+\k 10	Ctrl-J		\ac{hunter-2tanks} Jettison inner and outer pylon stores
 \k 11	Ctrl-K		{}
-\k 12	Ctrl-L		\ac{hunter|seahawk} Seat default
+\k 12	Ctrl-L		\ac{hunter|seahawk} Seat default; \ac{Concorde} Disable autopilot
 \k 13	Ctrl-M/Enter	Move rudder right
 \k 14	Ctrl-N		Toggle autopilot nav1 lock
 \k 15	Ctrl-O		{}
 \k 16	Ctrl-P		Toggle pitch hold
 \k 17	Ctrl-Q		{}
-\k 18	Ctrl-R		Show radio dialog
+\k 18	Ctrl-R		Show radio setting dialog
 \k 19	Ctrl-S		Toggle auto-throttle lock
 \k 20	Ctrl-T		Toggle autopilot terrain lock
 \k 21	Ctrl-U		[Cheat] Add 1000\,ft of emergency altitude
-\k 22	Ctrl-V		Select initial view (view 0)
+\k 22	Ctrl-V		Select initial view (view 0; pilot view)
 \k 23	Ctrl-W		Toggle autopilot wing leveler
 \k 24	Ctrl-X		Reset zoom to default
 \k 25	Ctrl-Y		{}
 \k 26	Ctrl-Z		{}
-\k 27	Esc		Prompt and quit FlightGear	\shift{Reset}
+\k 27	Esc		Prompt and quit FlightGear	\shift{Reset FlightGear}
 \k 28	Ctrl-4/Ctrl-\|	{}
 \k 29	Ctrl-5/Ctrl-]	{}
 \k 30	Ctrl-6		{}
 \k 31	Ctrl-7/Ctrl-/	{}
-\k 32	Space		Fire starter on selected engine(s)
+\k 32	Space		Fire starter on selected engine(s); \ac{spitfire} Coffman starter
 \k 33	!		Select first engine
 \k 34	"		{}
 \k 35	\#		Select third engine
@@ -125,8 +126,8 @@
 \k 37	\%		{}
 \k 38	\&		{}
 \k 39	'~(Apostrophe)	Display a dialog relevant to the tuned in ATC service (if any)
-\k 40	(		{}
-\k 41	)		{}
+\k 40	(		\ac{spitfire} Toggle left fuel cock
+\k 41	)		\ac{spitfire} Toggle right fuel cock
 \k 42	*		{}
 \k 43	+		{}
 \k 44	,~(Comma)	Left brake
@@ -134,39 +135,39 @@
 \k 46	.~(Period)	Right brake
 \k 47	/		{}
 \k 48	0		Move rudder left
-\k 49	1		Decrease elevator trim
-\k 50	2		Increase elevator or autopilot altitude
-\k 51	3		Decrease throttle or autopilot autothrottle
-\k 52	4		Move aileron left (or adjust AP heading)
+\k 49	1		Decrease elevator trim				\shift{Look back left}
+\k 50	2		Increase elevator or autopilot altitude		\shift{Look back}
+\k 51	3		Decrease throttle or autopilot autothrottle	\shift{Look back right}
+\k 52	4		Move aileron left (or adjust AP heading)	\shift{Look left}
 \k 53	5		Center aileron, elevator, and rudder
-\k 54	6		Move aileron right (or adjust AP heading)
-\k 55	7		Increase elevator trim
-\k 56	8		Decrease elevator or autopilot altitude
-\k 57	9		Increase throttle or autopilot autothrottle
+\k 54	6		Move aileron right (or adjust AP heading)	\shift{Look right}
+\k 55	7		Increase elevator trim				\shift{Look front left}
+\k 56	8		Decrease elevator or autopilot altitude		\shift{Look forward}
+\k 57	9		Increase throttle or autopilot autothrottle	\shift{Look front right}
 \k 58	:~(Colon)	{}
 \k 59	;~(Semicolon)	{}
-\k 60	<		\ac{c182|c310|pa28-161} Rudder trim left
+\k 60	<		\ac{spitfire} Rudder trim left
 \k 61	=		{}
-\k 62	>		\ac{c182|c310|pa28-161} Rudder trim right
+\k 62	>		\ac{spitfire} Rudder trim right
 \k 63	?		{}
 \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
-\k 68	D		{}
+\k 67	C		\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
+\k 70	F		\ac{hunter|seahawk|spitfire} Wing fold down
 \k 71	G		Gear down
-\k 72	H		Cycle HUD brightness; \ac{hunter|seahawk} Hook down
-\k 73	I		Alternative HUD
-\k 74	J		\ac{hunter} Jettison outer pylon stores
-\k 75	K		{}
+\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 77	M		Decrease warp
-\k 78	N		{}
-\k 79	O		{}
-\k 80	P		Toggle panel; \ac{T38} Fuel cutoff switch or lever
-\k 81	Q		{}
+\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 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)
 \k 83	S		\ac{A320|MD11} Fire starter on selected engine(s)
 \k 84	T		Decrease warp delta
@@ -176,26 +177,26 @@
 \k 88	X		Increase field of view
 \k 89	Y		{}
 \k 90	Z		Decrease Visibility
-\k 91	[		Decrease flaps; \ac{737|A320|hunter|seahawk} Decrease flaps; \ac{ComperSwift} Adjust view left; \ac{b52} --
+\k 91	[		Decrease flaps; \ac{737|hunter|seahawk} Decrease flaps; \ac{ComperSwift} Adjust view left; \ac{B-52F} --
 \k 92	\|		{}
-\k 93	]		Increase flaps; \ac{737|A320|hunter|seahawk} Increase flaps; \ac{ComperSwift} Adjust view right; \ac{b52} --
+\k 93	]		Increase flaps; \ac{737|hunter|seahawk} Increase flaps; \ac{ComperSwift} Adjust view right; \ac{B-52F} --
 \k 94	\^		{}
 \k 95	\_~(Underscore)	{}
 \k 96	`{}~(Backtick)	{}
 \k 97	a		Increase speed-up
-\k 98	b		Apply all brakes; \ac{b52} Apply all brakes
+\k 98	b		Apply all brakes
 \k 99	c		Toggle 3D/2D cockpit
-\k 100	d		\ac{an225|yf23} Retract slats
+\k 100	d		\ac{AN-225|YF-23|A-10} Retract slats; \ac{spitfire} Door fold up
 \k 101	e		{}
-\k 102	f		\ac{an225|yf23} Extend slats; \ac{hunter|seahawk} Wing fold up
+\k 102	f		\ac{AN-225|YF-23|A-10} Extend slats; \ac{hunter|seahawk|spitfire} Wing fold up
 \k 103	g		Gear Up
-\k 104	h		Cycle HUD: green/red/off; \ac{hunter|seahawk} Hook 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
-\k 106	j		Decrease spoilers; \ac{hunter} Jettison inner pylon stores
-\k 107	k		Increase spoilers; \ac{hunter|seahawk} Null
-\k 108	l		Toggle tail-wheel lock; \ac{hunter|seahawk} Seat up
-\k 109	m		Increase warp
-\k 110	n		{}
+\k 106	j		Decrease spoilers; \ac{hunter-2tanks} Jettison inner pylon stores
+\k 107	k		Increase spoilers; \ac{hunter|seahawk} Null; \ac{spitfire} Toggle gear warning
+\k 108	l		Toggle tail-wheel lock; \ac{hunter|seahawk|spitfire} Seat up
+\k 109	m		Increase warp; \ac{spitfire} Mixture rich
+\k 110	n		\ac{spitfire} Propeller fine
 \k 111	o		{}
 \k 112	p		Toggle the pause state of the sim
 \k 113	q		{}
@@ -208,17 +209,17 @@
 \k 120	x		Decrease field of view
 \k 121	y		{}
 \k 122	z		Increase Visibility
-\k 123	\{		Decrease magneto on selected engine
+\k 123	\{		Decrease magneto on selected engine; \ac{bo105} Start engines/rotor; \ac{spitfire} Toggle left magneto switch
 \k 124	|		{}
-\k 125	\}		Increase magneto on selected engine
+\k 125	\}		Increase magneto on selected engine; \ac{bo105} Stop rotor/engines; \ac{spitfire} Toggle right magneto switch
 \k 126	{\tld}		Select all engines
 \k 127	Ctrl-8		{}
-\k 257	F1		Load flight					\shift{}
+\k 257	F1								\shift{Load flight}
 \k 258	F2		Force tile cache reload				\shift{Save flight}
 \k 259	F3		Capture screen					\shift{Load panel}
 \k 260	F4		Force lighting update				\shift{Reload global preferences}
 \k 261	F5								\shift{Scroll panel down}
-\k 262	F6		Toggles autopilot target location		\shift{Scroll panel up}
+\k 262	F6		Toggle autopilot heading mode			\shift{Scroll panel up}
 \k 263	F7 								\shift{Scroll panel left}
 \k 264	F8 		Cycle fog type					\shift{Scroll panel right}
 \k 265	F9 		Toggle textures					\shift{}
@@ -227,14 +228,14 @@
 \k 268	F12		{}
 \k 269	Enter		Move rudder right
 \k 309	Keypad~5	Center aileron, elevator, and rudder
-\k 356	Left		Move aileron left (or adjust AP heading)
-\k 357	Up		Increase elevator or autopilot altitude
-\k 358	Right		Move aileron right (or adjust AP heading)
-\k 359	Down		Decrease elevator or autopilot altitude
-\k 360	PageUp		Increase throttle or autopilot autothrottle
-\k 361	PageDown	Decrease throttle or autopilot autothrottle
-\k 362	Home		Increase elevator trim
-\k 363	End		Decrease elevator trim
+\k 356	Left		Move aileron left (or adjust AP heading)	\shift{Look left}
+\k 357	Up		Increase elevator or autopilot altitude		\shift{Look forward}
+\k 358	Right		Move aileron right (or adjust AP heading)	\shift{Look right}
+\k 359	Down		Decrease elevator or autopilot altitude		\shift{Look backwards}
+\k 360	PageUp		Increase throttle or autopilot autothrottle	\shift{Look front right}; \ac{bo105} Increase collective
+\k 361	PageDown	Decrease throttle or autopilot autothrottle	\shift{Look back right};  \ac{bo105} Lower collective
+\k 362	Home		Increase elevator trim				\shift{Look front left}
+\k 363	End		Decrease elevator trim				\shift{Look back left}
 \k 364	Insert		Move rudder left
 \end{keyboard}