38 files changed, 480 insertions, 446 deletions

diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index abfb6a3e21..5e417ff5b4 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -7,24 +7,22 @@ not have clock support.)
 
 Key controls for this demo are:
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action} \\\midrule
+\begin{table}
+\begin{btnmap}{}{}
 F1/F2/F3 & Enters Bounce configuration options \\
 UP/DOWN & Moves to next/previous option \\
 LEFT/RIGHT & Increases/decreases option value \\
 ON & Changes to Scroll mode \\
-OFF & Exits bounce demo\\\bottomrule
-\end{tabular}
-\end{center}
+OFF & Exits bounce demo\\
+\end{btnmap}
 \end{table}
+
 Available options are:
 
-\begin{itemize}
-\item \textbf{Xdist/Ydist:} The distance to X axis and Y axis
+\begin{description}
+\item[Xdist/Ydist.] The distance to X axis and Y axis
 respectively
-\item \textbf{Xadd/Yadd:} how fast the code moves on the sine curve on
+\item[Xadd/Yadd.]How fast the code moves on the sine curve on
 each axis
-\item \textbf{Xsane/Ysane:} Changes the appearance of the bouncing.
-\end{itemize}
+\item[Xsane/Ysane.] Changes the appearance of the bouncing.
+\end{description}
diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index fe777070c8..00c3794ff0 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -6,8 +6,8 @@ destroy all the bricks by hitting them with the ball once or more. Sometimes a
 special falls down when you destroy a brick. For a special to take effect, you
 must catch it with the paddle. Look out for the bad ones.\\
 
-\textbf{Specials}
-\begin{table}[ht!]
+\subsubsection{Specials}
+\begin{table}
     \begin{center}
     \begin{tabular}{cll}\toprule
     \textbf{Displayed} & \textbf{Name} & \textbf{Description}\\\midrule
@@ -22,17 +22,14 @@ must catch it with the paddle. Look out for the bad ones.\\
     \end{center}
 \end{table}
 
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
+\begin{table}
+    \begin{btnmap}{}{}
     \ButtonLeft\ / \ButtonRight & Moves the paddle\\
     \opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay}\opt{ONDIO_PAD}{\ButtonMenu}
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{\ButtonSelect}
         & Release the ball / Fire\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
         \opt{IPOD_4G_PAD}{\ButtonMenu}\opt{IAUDIO_X5_PAD}{\ButtonPower}
-        & Open menu / Quit\\\bottomrule
-    \end{tabular}
-    \end{center}
+        & Open menu / Quit\\
+    \end{btnmap}
 \end{table}
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index 2a0be04c6a..0f74a86e3e 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -7,33 +7,39 @@ the board extend below the bottom line. To make things more difficult, the
 entire board is shifted down every time a certain number of shots have been
 fired. Points are awarded depending on how quickly the level was completed.
 
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
+\begin{table}
+    \begin{btnmap}{}{}
     \multicolumn{2}{c}{\textbf{In menu}}\\\hline
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}\opt{IPOD_4G_PAD,IAUDIO_X5_PAD}
-        {\ButtonPlay} & Start new game\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}\opt{IPOD_4G_PAD}
-        {\ButtonLeft+\ButtonRight}\opt{IAUDIO_X5_PAD}{\ButtonRec}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay} 
+    & Start new game\\
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+    \opt{IPOD_4G_PAD}{\ButtonLeft+\ButtonRight}
+    \opt{IAUDIO_X5_PAD}{\ButtonRec}
         & Resume saved game\\
     \ButtonSelect & Show high scores\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp/\ButtonDown}
-        \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
         & Select starting level\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}\opt{IPOD_4G_PAD}{\ButtonMenu}
-        \opt{IAUDIO_X5_PAD}{\ButtonPower} & Quit\\\hline
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IAUDIO_X5_PAD}{\ButtonPower}
+        & Quit\\\hline
     \multicolumn{2}{c}{\textbf{In game}}\\\hline
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}\opt{IPOD_4G_PAD,IAUDIO_X5_PAD}
-        {\ButtonPlay} & Pause game\\
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
+    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay} 
+        & Pause game\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonLeft/\ButtonRight}
-        \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
         & Aim the bubble\\
     \ButtonSelect & Fire bubble\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}\opt{IPOD_4G_PAD}{\ButtonLeft+\ButtonRight}
-        \opt{IAUDIO_X5_PAD}{\ButtonRec} & Save game\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}\opt{IPOD_4G_PAD}{\ButtonMenu}
-        \opt{IAUDIO_X5_PAD}{\ButtonPower} & Exit to menu\\\bottomrule
-    \end{tabular}
-    \end{center}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+    \opt{IPOD_4G_PAD}{\ButtonLeft+\ButtonRight}
+    \opt{IAUDIO_X5_PAD}{\ButtonRec} 
+        & Save game\\
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IAUDIO_X5_PAD}{\ButtonPower} 
+        & Exit to menu\\
+    \end{btnmap}
 \end{table}
diff --git a/manual/plugins/calendar.tex b/manual/plugins/calendar.tex
index 11b2a86c0a..a7698782b3 100644
--- a/manual/plugins/calendar.tex
+++ b/manual/plugins/calendar.tex
@@ -11,16 +11,14 @@ This is a small and simple calendar application with memo saving function.
 Dots indicate dates with memos. To add a new memo press PLAY on the
 date. Includes one off, annual, monthly, and weekly memos:
 
-\begin{table}[h!]
-\begin{tabular}{|c|c|}
-\hline
-KEY & ACTION \\\hline
-PLAY & monthly \\\hline
-LEFT & weekly \\\hline
-RIGHT & annually \\\hline
-ON & one off \\\hline
-STOP & exit \\\hline
-\end{tabular}
+\begin{table}
+  \begin{btnmap}{}{}
+  PLAY & monthly \\
+  LEFT & weekly \\
+  RIGHT & annually \\
+  ON & one off \\
+  STOP & exit \\
+  \end{btnmap}
 \end{table}
 
 
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index 26834adf96..925bace112 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -26,18 +26,27 @@ time left if different).
 
 Keys are as follows:
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action}\\\midrule
-\opt{player}{On}\opt{recorder,recorderv2fm}{Off}\opt{ondio}{OnOff}\opt{h1xx,h300,ipodcolor,ipodnano}{Select} & Exit plugin \\
-\opt{player}{Stop}\opt{recorder,recorderv2fm,Ondio}{Left}\opt{h1xx,h300,ipodcolor,ipodnano}{Stop} & Restart round for the player \\
-\opt{player,h1xx,h300,ipodcolor,ipodnano,recorder,recorderv2fm}{Play}\opt{Ondio}{Right} & Pausing the time (press again to continue) \\
-\opt{player,h1xx,h300,ipodcolor,ipodnano}{Right}\opt{ondio,recorder,recorderv2fm}{Up} & Switch to next player \\
-\opt{player,h1xx,h300,ipodcolor,ipodnano}{Left}\opt{ondio,recorder,recorderv2fm}{Down} & Switch to previous player \\
-\opt{player}{Menu}\opt{recorder,recorderv2fm}{F1}\opt{ondio}{Mode}\opt{h1xx,h300,ipodcolor,ipodnano}{Rec} & Exit plugin \\\bottomrule
-\end{tabular}
-\end{center}
+\begin{table}
+\begin{btnmap}{}{}
+\opt{player}{On}\opt{recorder,recorderv2fm}{Off}\opt{ondio}{OnOff}
+\opt{h1xx,h300,ipodcolor,ipodnano}{Select} 
+& Exit plugin \\
+\opt{player}{Stop}\opt{recorder,recorderv2fm,Ondio}{Left}
+\opt{h1xx,h300,ipodcolor,ipodnano}{Stop} 
+& Restart round for the player \\
+\opt{player,h1xx,h300,ipodcolor,ipodnano,recorder,recorderv2fm}{Play}
+\opt{Ondio}{Right} 
+& Pausing the time (press again to continue) \\
+\opt{player,h1xx,h300,ipodcolor,ipodnano}{Right}
+\opt{ondio,recorder,recorderv2fm}{Up} 
+& Switch to next player \\
+\opt{player,h1xx,h300,ipodcolor,ipodnano}{Left}
+\opt{ondio,recorder,recorderv2fm}{Down} 
+& Switch to previous player \\
+\opt{player}{Menu}\opt{recorder,recorderv2fm}{F1}
+\opt{ondio}{Mode}\opt{h1xx,h300,ipodcolor,ipodnano}{Rec} 
+& Exit plugin \\
+\end{btnmap}
 \end{table}
 From the menu it is possible to delete a player, modify the round time
 for the current player or set the total time for the game. 
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index 0d28702591..1893969ca1 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -3,10 +3,8 @@
 Chessbox is a chess game with computer AI. The chess engine is a port of GNU Chess 2 by John Stanback.\\
 
 \textbf{Keys}
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
+\begin{table}
+    \begin{btnmap}{}{}
     Direction keys & Move the cursor\\
     \opt{recorder,recorderv2fm}{PLAY}\opt{ondio}{short press on MODE}\opt{h1xx,ipodcolor,ipodnano}{SELECT}\opt{h300}{NAVI}
     & Select / Move piece\\
@@ -15,7 +13,6 @@ Chessbox is a chess game with computer AI. The chess engine is a port of GNU Che
     \opt{recorder,recorderv2fm}{MENU}\opt{ondio}{long press on MODE}\opt{h1xx,h300}{PLAY}\opt{ipodcolor,ipodnano}{SELECT+PLAY}
     & Force play\\
     \opt{recorder,recorderv2fm,h1xx,h300}{STOP}\opt{ondio}{OFF}\opt{ipodcolor,ipodnano}{SELECT+MENU}
-    & Quit\\\bottomrule
-    \end{tabular}
-    \end{center}
+    & Quit\\
+    \end{btnmap}
 \end{table}
diff --git a/manual/plugins/chip8emulator.tex b/manual/plugins/chip8emulator.tex
index cc6c26bc6f..b7071c3cd4 100644
--- a/manual/plugins/chip8emulator.tex
+++ b/manual/plugins/chip8emulator.tex
@@ -23,7 +23,7 @@ Rockbox key). For example, a file containing the single line:\\\\
 would correspond to the following non-default mappings:\\\\
 3 $\rightarrow$ 2\hspace{1cm} 6 $\rightarrow$ 8\hspace{1cm} 7 $\rightarrow$ 4\hspace{1cm} 8 $\rightarrow$ 6\\\\
 Default keymappings:
-\begin{table}[!htb]
+\begin{table}
   \begin{center}
   \begin{footnotesize}
     \begin{tabular}{@{}*{16}{@{\hspace{1mm}}c@{\hspace{1mm}}|}@{\hspace{1mm}}c@{}}\toprule
diff --git a/manual/plugins/clock.tex b/manual/plugins/clock.tex
index 42bdd7ebc8..733d057d07 100644
--- a/manual/plugins/clock.tex
+++ b/manual/plugins/clock.tex
@@ -10,23 +10,19 @@ This is a fully featured analogue and digital clock program.
 
 \subsubsection{Key configuration}
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{|c|c|}
-\hline
-KEY & ACTION \\\hline
-F1 & Help \\\hline
-F2 & Start / Stop stopwatch \\\hline
-F2 (Hold) & Reset stopwatch \\\hline
-F3 & Options \\\hline
-Play & Select clock mode \\\hline
-UP & Enable idle power off \\\hline
-DOWN & Disable idle power off \\\hline
-RIGHT & Enable backlight \\\hline
-LEFT & Disable backlight \\\hline
-OFF & Save settings to disk and exit \\\hline
-\end{tabular}
-\end{center}
+\begin{table}
+\begin{btnmap}{}{}
+F1 & Help \\
+F2 & Start / Stop stopwatch \\
+F2 (Hold) & Reset stopwatch \\
+F3 & Options \\
+Play & Select clock mode \\
+UP & Enable idle power off \\
+DOWN & Disable idle power off \\
+RIGHT & Enable backlight \\
+LEFT & Disable backlight \\
+OFF & Save settings to disk and exit \\
+\end{btnmap}
 \end{table}
 
 \subsubsection{Backlight configuration}
@@ -39,10 +35,10 @@ setting for Backlight will be restored.
 
 \subsubsection{Saving Settings}
 Settings are saved to disk when Clock is exited. They are saved to
-\textbf{/.rockbox/rocks/.clock\_settings''}. To reset your settings
+\fname{/.rockbox/rocks/.clock\_settings}. To reset your settings
 back to the defaults, simply navigate to this file using Rockbox,
 highlight it, and press the ON+PLAY keys to get the Delete option. This way you can feel free to experiment with the settings {}- and you could even load
-separate settings, say, one for your desk at home and one for in the car {}- by keeping two files in your \textbf{/.rockbox/rocks} folder such as
+separate settings, say, one for your desk at home and one for in the car {}- by keeping two files in your \fname{/.rockbox/rocks} folder such as
 ``h.clock\_settings'' and ``c.clock\_settings''. Simply remove the
 ``h'' for your home settings to go into effect, or add the ``h'' back and take off the ``c'' for your car settings.
 
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index 785ad46634..2b42da8b7e 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -2,20 +2,22 @@
 \screenshot{plugins/images/ss-demystify}{Demystify}%
 {img:demystify}
 Demystify is a screen saver like demo.\\
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}\opt{ipodcolor,ipodnano,ipodvideo}{Right}
+\begin{table}
+    \begin{btnmap}{}{}
+    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Right}
         & Add polygon\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}\opt{ipodcolor,ipodnano,ipodvideo}{Left}
+    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Left}
         & Remove polygon\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Right}\opt{ipodcolor,ipodnano,ipodvideo}{Scroll forward}
+    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Right}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll forward}
         & Increase speed\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Left}\opt{ipodcolor,ipodnano,ipodvideo}{Scroll backward}
+    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Left}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll backward}
         & Decrease speed\\
-    \opt{recorder,recorderv2fm,h1xx,h300}{Stop}\opt{ondio}{Off}\opt{ipodcolor,ipodnano,ipodvideo}{Menu}
-        & Quit\\\bottomrule
-    \end{tabular}
-    \end{center}
+    \opt{recorder,recorderv2fm,h1xx,h300}{Stop}
+    \opt{ondio}{Off}\opt{ipodcolor,ipodnano,ipodvideo}{Menu}
+        & Quit\\
+    \end{btnmap}
 \end{table}
diff --git a/manual/plugins/dice.tex b/manual/plugins/dice.tex
index 2d19146beb..a2afd084e6 100755
--- a/manual/plugins/dice.tex
+++ b/manual/plugins/dice.tex
@@ -3,23 +3,25 @@ Dice is a simple dice rolling simulator. You can select number and type of dice
 to roll, it shows individual numbers as well as the total of the rolled
 dice.
 
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
-    \ButtonLeft/\ButtonRight & Pick between type and number of dice\\
+\begin{table}
+    \begin{btnmap}{}{}
+    \ButtonLeft/\ButtonRight 
+        & Pick between type and number of dice\\
     \opt{PLAYER_PAD}{\ButtonPlay/\ButtonStop}
-        \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp/\ButtonDown}
-        \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
         & Select number of sides or number of dice\\
     \opt{PLAYER_PAD}{\ButtonOn}\opt{RECORDER_PAD}{\ButtonOn/\ButtonPlay}
-        \opt{ONDIO_PAD}{\ButtonMenu}\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn/\ButtonSelect}
-        \opt{IPOD_4G_PAD}{\ButtonSelect}\opt{IAUDIO_X5_PAD}{\ButtonSelect/\ButtonPlay}
+    \opt{ONDIO_PAD}{\ButtonMenu}\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}
+        {\ButtonOn/\ButtonSelect}
+    \opt{IPOD_4G_PAD}{\ButtonSelect}
+    \opt{IAUDIO_X5_PAD}{\ButtonSelect/\ButtonPlay}
         & Roll dice\\
-    \opt{PLAYER_PAD}{\ButtonMenu}\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
-        {\ButtonOff}\opt{IPOD_4G_PAD}{Long press on \ButtonPlay}\opt{IAUDIO_x5_PAD}{\ButtonPower}
-        & Quit\\\bottomrule
-    \end{tabular}
-    \end{center}
+    \opt{PLAYER_PAD}{\ButtonMenu}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IPOD_4G_PAD}{Long press on \ButtonPlay}
+    \opt{IAUDIO_x5_PAD}{\ButtonPower}
+        & Quit\\
+    \end{btnmap}
 \end{table}
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index ae6b724865..c3649df137 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -2,20 +2,22 @@
 \screenshot{plugins/images/ss-fire}{Fire}{img:fire}
 Fire is a demo displaying a fire effect.
 
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}\opt{ipodcolor,ipodnano,ipodvideo}{Scroll backward}
+\begin{table}
+    \begin{btnmap}{}{}
+    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll backward}
     & Increase number of flames\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}\opt{ipodcolor,ipodnano,ipodvideo}{Scroll forward}
+    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll forward}
     & Decrease number of flames\\
-    \opt{recorder,recorderv2fm}{Menu}\opt{ondio}{Mode}\opt{h1xx,h300}{A-B}\opt{ipodcolor,ipodnano,ipodvideo}{Select}
+    \opt{recorder,recorderv2fm}{Menu}\opt{ondio}{Mode}
+    \opt{h1xx,h300}{A-B}\opt{ipodcolor,ipodnano,ipodvideo}{Select}
     & Toggle flame type\\
-    \opt{recorder,recorderv2fm}{Play}\opt{ondio,ipodcolor,ipodnano,ipodvideo}{Right}\opt{h1xx,h300}{Record}
+    \opt{recorder,recorderv2fm}{Play}
+    \opt{ondio,ipodcolor,ipodnano,ipodvideo}{Right}\opt{h1xx,h300}{Record}
     & Toggle moving flames\\
-    \opt{recorder,recorderv2fm,h1xx,h300}{Stop}\opt{ondio}{Off}\opt{ipodcolor,ipodnano,ipodvideo}{Menu}
-    & Quit\\\bottomrule
-    \end{tabular}
-    \end{center}
+    \opt{recorder,recorderv2fm,h1xx,h300}{Stop}
+    \opt{ondio}{Off}\opt{ipodcolor,ipodnano,ipodvideo}{Menu}
+    & Quit\\
+    \end{btnmap}
 \end{table}
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index bec4826a63..a896764967 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -5,16 +5,23 @@ Flipping the colour of the token under the cursor also flips the tokens
 above, below, left and right of the cursor.  The aim is to end up with
 a screen containing tokens of only one colour.
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action} \\\midrule
-\opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{Up/Down/Left/Right} & Changes the cursor \\
-\opt{recorder,recorderv2fm}{PLAY}\opt{ondio}{Mode}\opt{h1xx,h300}{Select}\opt{ipodcolor,ipodnano}{Unknown} & Toggle \\
-\opt{recorder,recorderv2fm}{F1}\opt{ondio}{Mode +Left}\opt{h1xx,h300}{Mode}\opt{ipodcolor,ipodnano}{Unknown} & Shuffle \\
-\opt{recorder,recorderv2fm}{F2}\opt{ondio}{Mode + Right}\opt{h1xx,h300}{Play}\opt{ipodcolor,ipodnano}{Unknown} & Solution \\
-\opt{recorder,recorderv2fm}{F3}\opt{ondio}{Mode + On/off}\opt{h1xx,h300}{Rec}\opt{ipodcolor,ipodnano}{Unknown} & Step by step \\
-\opt{recorder,recorderv2fm}{OFF}\opt{ondio}{On/off}\opt{h1xx,h300}{Stop}\opt{ipodcolor,ipodnano}{Unknown} & Stop the game \\\bottomrule
-\end{tabular}
-\end{center}
+\begin{table}
+\begin{btnmap}{}{}
+\opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{Up/Down/Left/Right}  & Changes the cursor \\
+\opt{recorder,recorderv2fm}{PLAY}\opt{ondio}{Mode}
+\opt{h1xx,h300}{Select}\opt{ipodcolor,ipodnano}{Unknown} 
+  & Toggle \\
+\opt{recorder,recorderv2fm}{F1}\opt{ondio}{Mode+Left}
+\opt{h1xx,h300}{Mode}\opt{ipodcolor,ipodnano}{Unknown} 
+  & Shuffle \\
+\opt{recorder,recorderv2fm}{F2}\opt{ondio}{Mode + Right}
+\opt{h1xx,h300}{Play}\opt{ipodcolor,ipodnano}{Unknown} 
+  & Solution \\
+\opt{recorder,recorderv2fm}{F3}\opt{ondio}{Mode + On/off}\opt{h1xx,h300}{Rec}
+\opt{ipodcolor,ipodnano}{Unknown} 
+  & Step by step \\
+\opt{recorder,recorderv2fm}{OFF}\opt{ondio}{On/off}
+\opt{h1xx,h300}{Stop}\opt{ipodcolor,ipodnano}{Unknown} 
+  & Stop the game \\
+\end{btnmap}
 \end{table}
diff --git a/manual/plugins/jackpot.tex b/manual/plugins/jackpot.tex
index c006b3b7d1..1884d48ab8 100644
--- a/manual/plugins/jackpot.tex
+++ b/manual/plugins/jackpot.tex
@@ -9,13 +9,12 @@ Jackpot
 This is a jackpot slot machine game. At the beginning of the game you
 have 20\$.  Payouts are given when three matching symbols come up.
 
-\begin{table}[h!]
-\begin{tabular}{|c|c|}
-\hline
-KEY & ACTION \\\hline
-PLAY & Play \\\hline
-STOP & Exit the game \\\hline
-\end{tabular}
+\begin{table}
+\begin{btnmap}{}{}
+KEY & ACTION \\
+PLAY & Play \\
+STOP & Exit the game \\
+\end{btnmap}
 \end{table}
 
 
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index c67a970a93..07b39840dc 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -5,10 +5,11 @@ Open a .jpg file in the file browser to view it\opt{recorder,recorderv2fm,ondio,
 the decoding process needs to share memory with audio tracks. To be able viewing
 bigger file you may need to stop playback.}
 
-\begin{table}[!htb]
-    \begin{center}
+\fixme{use btnmap here -- make this table break more nicely}
+\begin{table}
+\begin{center}
     \begin{tabularx}{.8\textwidth}{lX}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
+    \btnhead
     \opt{recorder,recorderv2fm,h1xx,h300}{\ButtonUp\ / \ButtonDown\ / }
       \ButtonLeft\ / \ButtonRight
     & Move around in zoomed in image\\
diff --git a/manual/plugins/logo.tex b/manual/plugins/logo.tex
index 7b46d0721d..4ea1eb6d84 100644
--- a/manual/plugins/logo.tex
+++ b/manual/plugins/logo.tex
@@ -1,14 +1,13 @@
 \subsection{Logo}
 Demo showing the Rockbox logo bouncing around the screen.
 
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
-    \opt{player}{Plus / Minus, On+Plus / On+Minus}\opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano,ipodvideo}{Directions}
+\begin{table}
+    \begin{btnmap}{}{}
+    \opt{player}{Plus / Minus, On+Plus / On+Minus}
+    \opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano,ipodvideo}{Directions}
     & Increase / decrease speed in either direction.\\
-    \opt{player,recorder,recorderv2fm,h1xx,h300}{Stop}\opt{ondio}{Off}\opt{ipodcolor,ipodnano,ipodvideo}{Menu}
-    & Quit\\\bottomrule
-    \end{tabular}
-    \end{center}
+    \opt{player,recorder,recorderv2fm,h1xx,h300}{Stop}
+    \opt{ondio}{Off}\opt{ipodcolor,ipodnano,ipodvideo}{Menu}
+    & Quit\\
+    \end{btnmap}
 \end{table}
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index b7c592116b..463a7bc731 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -4,16 +4,13 @@
 
 This is another demonstration using the grayscale engine.  It draws fractal images from the Mandelbrot set.
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action} \\\midrule
+\begin{table}
+\begin{btnmap}{}{}
 Arrow keys & Move about the image \\
 PLAY & Zoom in \\
 OFF & Quit \\
 F1 & Increase iteration depth (more detail) \\
 F2 & Decrease iteration depth (less detail) \\
-F3 & Reset and return to the default image \\\bottomrule
-\end{tabular}
-\end{center}
+F3 & Reset and return to the default image \\
+\end{btnmap}
 \end{table}
diff --git a/manual/plugins/metronome.tex b/manual/plugins/metronome.tex
index 242397768b..aa2ebbcc2c 100644
--- a/manual/plugins/metronome.tex
+++ b/manual/plugins/metronome.tex
@@ -3,15 +3,20 @@ This plugin can be used as a metronome to keep time during music
 practice.  Adjust the tempo though the interface or by tapping it out
 on the appropriate button.
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action}\\\midrule
-\opt{player,h1xx,h300}{Stop}\opt{recorder,recorderv2fm}{Off}\opt{ondio}{OnOff}\opt{ipodcolor,ipodnano}{Menu} & Exit plugin \\
-\opt{player,recorder,recorderv2fm,h1xx,h300,ipodcolor,ipodnano}{Play}\opt{ondio}{Mode (hold: Stop)} & Start / Stop \\
-\opt{player,recorder,recorderv2fm}{On}\opt{ondio}{Mode (repeatedly)}\opt{h1xx,h300,ipodcolor,ipodnano}{Select} & Tap tempo \\
+\begin{table}
+\begin{btnmap}{}{}
+\opt{player,h1xx,h300}{Stop}\opt{recorder,recorderv2fm}{Off}
+\opt{ondio}{OnOff}\opt{ipodcolor,ipodnano}{Menu} 
+& Exit plugin \\
+\opt{player,recorder,recorderv2fm,h1xx,h300,ipodcolor,ipodnano}{Play}
+\opt{ondio}{Mode (hold: Stop)} 
+& Start / Stop \\
+\opt{player,recorder,recorderv2fm}{On}\opt{ondio}{Mode (repeatedly)}
+\opt{h1xx,h300,ipodcolor,ipodnano}{Select} 
+& Tap tempo \\
 Left/Right & Adjust tempo \\
-\opt{player}{On+Left/Right}\opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{Up/Down} & Adjust volume \\\bottomrule
-\end{tabular}
-\end{center}
+\opt{player}{On+Left/Right}
+\opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor,ipodnano}{Up/Down} 
+& Adjust volume \\
+\end{btnmap}
 \end{table}
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index d08ee3e873..e74aab6fe3 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -1,6 +1,5 @@
 \subsection{Minesweeper}
-\screenshot{plugins/images/ss-minesweeper}%
-{Minesweeper plugin}{img:minesweeper}
+\screenshot{plugins/images/ss-minesweeper}{Minesweeper plugin}{img:minesweeper}
 
 The classic game of minesweeper.  Use the UP and DOWN keys to select the
 required percentage of mines to set the difficulty then press the MENU
@@ -14,12 +13,11 @@ mines are and avoid them.  When the player is certain that they know
 the location of a mine, it can be tagged to avoid accidentally
 ``stepping'' on it.
 
-\begin{table}[h!]
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action} \\\midrule
+\begin{table}
+\begin{btnmap}{}{}
 UP/DOWN/LEFT/RIGHT & Move the cursor across the minefield \\
 PLAY / F1 & Toggle flag on / off \\
 MENU / F2 & Reveal the contents of the current square \\
-STOP & Exit the game \\\bottomrule
-\end{tabular}
+STOP & Exit the game \\
+\end{btnmap}
 \end{table}
diff --git a/manual/plugins/nim.tex b/manual/plugins/nim.tex
index 8cea16382a..dbbcc30c39 100644
--- a/manual/plugins/nim.tex
+++ b/manual/plugins/nim.tex
@@ -11,17 +11,13 @@ alternately pick a certain number of matches and the one who takes the
 last match loses.  You can take up to twice as many matches as the
 Jukebox selected, and vice versa. 
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{|c|c|}
-\hline
-KEY & ACTION \\\hline
-MINUS & Decrease the number of matches \\\hline
-PLUS & Increase the number of matches \\\hline
-PLAY & Remove the number of matches you have selected \\\hline
-STOP & Exit the game \\\hline
-\end{tabular}
-\end{center}
+\begin{table}
+\begin{btnmap}{}{}
+MINUS & Decrease the number of matches \\
+PLUS & Increase the number of matches \\
+PLAY & Remove the number of matches you have selected \\
+STOP & Exit the game \\
+\end{btnmap}
 \end{table}
 
 \subsubsection{Pong (Recorder, Ondio)}
@@ -38,17 +34,14 @@ left player uses LEFT and F1 to move and the right player uses RIGHT
 and F3.  The aim is to prevent the ball leaving the screen.  The player
 that loses the least balls wins.
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{|c|c|}
-\hline
-KEY & ACTION \\\hline
-F1 & Player 1 up \\\hline
-LEFT & Player 1 down \\\hline
-F3 & Player 2 up \\\hline
-RIGHT & Player 2 down \\\hline
-OFF & Quit \\\hline
-\end{tabular}
-\end{center}
+\begin{table}
+\begin{btnmap}{}{}
+KEY & ACTION \\
+F1 & Player 1 up \\
+LEFT & Player 1 down \\
+F3 & Player 2 up \\
+RIGHT & Player 2 down \\
+OFF & Quit \\
+\end{btnmap}
 \end{table}
 
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 9837a241c6..8c4b675729 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -7,27 +7,31 @@ to user input and music may start to skip.
 
 \subsubsection{Keys}
 
-\begin{table}[ht!]
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action} \\\midrule
-\opt{recorder,recorderv2fm}{F1}\opt{ondio}{Mode}\opt{h1xx}{Select}\opt{h300}{Navi}\opt{ipodcolor,ipodnano}{Select+Play}
+\begin{table}
+\begin{btnmap}{}{}
+\opt{recorder,recorderv2fm}{F1}\opt{ondio}{Mode}\opt{h1xx}{Select}
+\opt{h300}{Navi}\opt{ipodcolor,ipodnano}{Select+Play}
     & Toggle filled / curve / plot \\
-\opt{recorder,recorderv2fm}{F2}\opt{ondio}{Mode+Right}\opt{h1xx,h300}{A-B}\opt{ipodcolor,ipodnano}{Select+Right}
+\opt{recorder,recorderv2fm}{F2}\opt{ondio}{Mode+Right}\opt{h1xx,h300}{A-B}
+\opt{ipodcolor,ipodnano}{Select+Right}
     & Toggle whether to scroll or not \\
-\opt{recorder,recorderv2fm}{F3}\opt{ondio}{Mode+Left}\opt{h1xx,h300}{Record}\opt{ipodcolor,ipodnano}{Select+Left}
+\opt{recorder,recorderv2fm}{F3}\opt{ondio}{Mode+Left}\opt{h1xx,h300}{Record}
+\opt{ipodcolor,ipodnano}{Select+Left}
     & Toggle drawing orientation \\
 Left & Slow down scrolling \\
 Right & Speed up scrolling \\
-\opt{recorder,recorderv2fm,h1xx,h300,ipodcolor,ipodnano}{Play}\opt{ondio}{Mode+Off}
+\opt{recorder,recorderv2fm,h1xx,h300,ipodcolor,ipodnano}{Play}
+\opt{ondio}{Mode+Off}
     & Pause the demo \\
-\opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}\opt{ipodcolor,ipodnano}{Scroll forward}
+\opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}
+\opt{ipodcolor,ipodnano}{Scroll forward}
     & Increase volume\\
-\opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}\opt{ipodcolor,ipodnano}{Scroll backward}
+\opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}
+\opt{ipodcolor,ipodnano}{Scroll backward}
     & Decrease volume\\
-\opt{recorder,recorderv2fm,h1xx,h300}{Stop}\opt{ondio}{Off}\opt{ipodcolor,ipodnano}{Select+Menu}
-    & Exit demo \\\bottomrule
-\end{tabular}
-\end{center}
+\opt{recorder,recorderv2fm,h1xx,h300}{Stop}\opt{ondio}{Off}
+\opt{ipodcolor,ipodnano}{Select+Menu}
+    & Exit demo \\
+\end{btnmap}
 \end{table}
 
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index 1ad78389af..4410d334ed 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -20,9 +20,8 @@ These need to be stored in the \fname{/.rockbox/pacman/} directory on your playe
 In the MAME ROMs collection the necessary files can be found in \fname{pacman.zip} and \fname{puckman.zip}.
 
 \subsubsection{Keys}
-\begin{center}
-  \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
+\begin{table}
+  \begin{btnmap}{}{}
     \opt{h1xx,h300}{RIGHT}\opt{ipodcolor,ipodnano}{NEXT} & Move Up\\
     \opt{h1xx,h300}{LEFT}\opt{ipodcolor,ipodnano}{PREV} & Move Down\\
     \opt{h1xx,h300}{UP}\opt{ipodcolor,ipodnano}{MENU} & Move Left\\
@@ -30,7 +29,7 @@ In the MAME ROMs collection the necessary files can be found in \fname{pacman.zi
     \opt{h1xx,h300}{REC}\opt{ipodcolor,ipodnano}{SELECT} & Insert Coin\\
     \opt{h1xx,h300,ipodcolor,ipodnano}{SELECT} & 1-Player Start\\
     \opt{h1xx,h300}{ON}\opt{ipodcolor,ipodnano}{n/a} & 2-Player Start\\
-    \opt{h1xx,h300}{MODE}\opt{ipodcolor,ipodnano}{SELECT+MENU} & Menu\\\bottomrule
-  \end{tabular}
-\end{center}
+    \opt{h1xx,h300}{MODE}\opt{ipodcolor,ipodnano}{SELECT+MENU} & Menu\\
+  \end{btnmap}
+\end{table}
 
diff --git a/manual/plugins/plasma.tex b/manual/plugins/plasma.tex
index 5ea31bcfc8..e748b12d0e 100644
--- a/manual/plugins/plasma.tex
+++ b/manual/plugins/plasma.tex
@@ -2,17 +2,18 @@
 \screenshot{plugins/images/ss-plasma}{Plasma}{img:plasma}
 Plasma is a demo displaying a 80's style retro plasma effect.
 
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}\opt{ipodcolor,ipodnano,ipodvideo}{Scroll backward}
+\begin{table}
+    \begin{btnmap}{}{}
+    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll backward}
     & Increase frequency\\
-    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}\opt{ipodcolor,ipodnano,ipodvideo}{Scroll forward}
+    \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Down}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Scroll forward}
     & Decrease frequency\\
-    \opt{ipodcolor,ipodnano,ipodvideo}{Select & Change colours\\}\opt{h300}{Navi & Change colours\\}
-    \opt{recorder,recorderv2fm,h1xx,h300}{Stop}\opt{ondio}{Off}\opt{ipodcolor,ipodnano,ipodvideo}{Menu}
-    & Quit\\\bottomrule
-    \end{tabular}
-    \end{center}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Select & Change colours\\}
+    \opt{h300}{Navi & Change colours\\}
+    \opt{recorder,recorderv2fm,h1xx,h300}{Stop}\opt{ondio}{Off}
+%
+    \opt{ipodcolor,ipodnano,ipodvideo}{Menu} & Quit\\
+    \end{btnmap}
 \end{table}
diff --git a/manual/plugins/pong.tex b/manual/plugins/pong.tex
index ab47c4238f..74c74eb67e 100644
--- a/manual/plugins/pong.tex
+++ b/manual/plugins/pong.tex
@@ -2,15 +2,22 @@
 \screenshot{plugins/images/ss-pong}{Pong}{img:pong}
 Pong is a simple two player ``tennis game''. Whenever a player misses the ball the other scores. 
 
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
-    \opt{recorder,recorderv2fm}{F1}\opt{ondio}{LEFT}\opt{h1xx,h300}{UP}\opt{ipodcolor,ipodnano}{MENU} & Left player up\\
-    \opt{recorder,recorderv2fm,ipodcolor,ipodnano}{LEFT}\opt{ondio}{MODE}\opt{h1xx,h300}{DOWN} & Left player down\\
-    \opt{recorder,recorderv2fm}{F3}\opt{ondio}{UP}\opt{h1xx,h300}{PLAY}\opt{ipodcolor,ipodnano}{RIGHT} & Right player up\\
-    \opt{recorder,recorderv2fm}{RIGHT}\opt{ondio}{DOWN}\opt{h1xx,h300}{A-B}\opt{ipodcolor,ipodnano}{PLAY} & Right player down\\
-    \opt{recorder,recorderv2fm,h1xx,h300}{STOP}\opt{ondio}{OFF}\opt{ipodcolor,ipodnano}{SELECT} & Quit\\\bottomrule
-    \end{tabular}
-    \end{center}
+\begin{table}
+    \begin{btnmap}{}{}
+    \opt{recorder,recorderv2fm}{F1}\opt{ondio}{LEFT}\opt{h1xx,h300}{UP}
+    \opt{ipodcolor,ipodnano}{MENU} 
+    & Left player up\\
+    \opt{recorder,recorderv2fm,ipodcolor,ipodnano}{LEFT}
+    \opt{ondio}{MODE}\opt{h1xx,h300}{DOWN} 
+    & Left player down\\
+    \opt{recorder,recorderv2fm}{F3}\opt{ondio}{UP}
+    \opt{h1xx,h300}{PLAY}\opt{ipodcolor,ipodnano}{RIGHT} 
+    & Right player up\\
+    \opt{recorder,recorderv2fm}{RIGHT}\opt{ondio}{DOWN}
+    \opt{h1xx,h300}{A-B}\opt{ipodcolor,ipodnano}{PLAY} 
+    & Right player down\\
+    \opt{recorder,recorderv2fm,h1xx,h300}{STOP}\opt{ondio}{OFF}
+    \opt{ipodcolor,ipodnano}{SELECT} 
+    & Quit\\
+    \end{btnmap}
 \end{table}
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index 80dab38ad6..bd8bc6e1b8 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -10,14 +10,11 @@ cleared, but if the blocks reach the top row then you lose.
 The controls for this game (with the Jukebox turned so that the buttons
 are to the right of the screen) are:
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action} \\\midrule
+\begin{table}
+\begin{btnmap}{}{}
 UP & Rotate piece \\
 LEFT/RIGHT & Move piece to the left/right \\
 DOWN & Move faster the piece downwards \\
-OFF & Exit Rockblox\\\bottomrule
-\end{tabular}
-\end{center}
+OFF & Exit Rockblox\\
+\end{btnmap}
 \end{table}
diff --git a/manual/plugins/rockbox_flash.tex b/manual/plugins/rockbox_flash.tex
index bd3b8feaf3..fd37daccd3 100644
--- a/manual/plugins/rockbox_flash.tex
+++ b/manual/plugins/rockbox_flash.tex
@@ -6,7 +6,7 @@
 Rockbox flash
 \par}
 
-For ``playing'' .UCL files on flashed Jukeboxes. Reprograms the flash memory of
+For ``playing'' \fname{.UCL} files on flashed Jukeboxes. Reprograms the flash memory of
 the Jukebox unit (see page \pageref{ref:Rockboxinflash} for details).
 
 
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index 43cd92312f..5ab16a53e7 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -5,39 +5,37 @@ on the gnuboy emulator. To start a game open a ROM file saved as .gb or
 .gbc in the file browser.\\
 
 \textbf{Default keys}
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{cll}\toprule
-    \textbf{Key} & \textbf{Function}\\\midrule
-    \opt{recorder,recorderv2fm}{F1}\opt{h1xx}{PLAY}\opt{h300}{RECORD}& A button\\
-    \opt{recorder,recorderv2fm}{F2}\opt{h1xx}{STOP}\opt{h300}{A-B}& B button\\
-    \opt{recorder,recorderv2fm}{F3}\opt{h1xx}{RECORD}\opt{h300}{PLAY}& Start\\
-    \opt{recorder,recorderv2fm}{PLAY}\opt{h1xx}{SELECT}\opt{h300}{NAVI}& Select\\
+\begin{table}
+    \begin{btnmap}{}{}
+    \opt{recorder,recorderv2fm}{F1}\opt{h1xx}{PLAY}\opt{h300}{RECORD}
+    & A button\\
+    \opt{recorder,recorderv2fm}{F2}\opt{h1xx}{STOP}\opt{h300}{A-B}
+    & B button\\
+    \opt{recorder,recorderv2fm}{F3}\opt{h1xx}{RECORD}\opt{h300}{PLAY}
+    & Start\\
+    \opt{recorder,recorderv2fm}{PLAY}\opt{h1xx}{SELECT}\opt{h300}{NAVI}
+    & Select\\
     \opt{recorder,recorderv2fm}{MENU & Cycle display scaling modes\\}
-    \opt{recorder,recorderv2fm,h300}{STOP}\opt{h1xx}{A-B}& Open Rockboy menu\\\bottomrule
-    \end{tabular}
-    \end{center}
+    \opt{recorder,recorderv2fm,h300}{STOP}\opt{h1xx}{A-B}
+    & Open Rockboy menu\\
+    \end{btnmap}
 \end{table}
 
 \textbf{Rockboy menu}
-\begin{itemize}
-\item \textbf{Back to Game}
-Takes you back to the game.
-\item \textbf{Load State\ldots}
-Loads a previously saved state.
-\item \textbf{Save State\ldots}
-Saves your current state.
-\item \textbf{Options\ldots}
-    \begin{itemize}
-    \item \textbf{Frameskip}
+\begin{description}
+\item[Back to Game.] Takes you back to the game.
+\item[Load State\ldots] Loads a previously saved state.
+\item[Save State\ldots] Saves your current state.
+\item[Options\ldots]
+    \begin{description}
+    \item[Frameskip.]
     Change frameskip setting to improve speed.
-    \item \textbf{Sound ON/OFF}
+    \item[Sound ON/OFF.]
     Toggle sound.
-    \item \textbf{Stats ON/OFF}
+    \item[Stats ON/OFF.]
     Toggle showing fps and current frameskip.
-    \item \textbf{Set Keys (BUGGY)}
+    \item[Set Keys (BUGGY)]
     Select this option to set a new keymapping.
-    \end{itemize}
-\item \textbf{Quit RockBoy}
-Quits the Rockboy plugin.
-\end{itemize}
+    \end{description}
+\item[Quit RockBoy.] Quits the Rockboy plugin.
+\end{description}
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index fea302b02a..41c6284fe7 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -6,14 +6,11 @@ see the whole picture.
 
 Key controls:
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action}\\\midrule
+\begin{table}
+\begin{btnmap}{}{}
 UP/DOWN/LEFT/RIGHT & Moves \\
 F1 & Shuffle \\
 F2 & Change the picture \\
-OFF & Stop the game \\\bottomrule
-\end{tabular}
-\end{center}
+OFF & Stop the game \\
+\end{btnmap}
 \end{table}
diff --git a/manual/plugins/snake2.tex b/manual/plugins/snake2.tex
index bca622df44..a87564f8df 100644
--- a/manual/plugins/snake2.tex
+++ b/manual/plugins/snake2.tex
@@ -9,19 +9,17 @@ into itself.
 
 The controls are:
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action} \\\midrule
+\begin{table}
+\begin{btnmap}{}{}
 UP/DOWN & (in menu) Set game speed \\
 F1 & (in menu) Change starting maze \\
 F3 & (in menu) Select game type (A or B) \\
 UP/DOWN/LEFT/RIGHT & Steer the snake \\
 PLAY & Pause the game \\
-STOP & Exit the game \\\bottomrule
-\end{tabular}
-\end{center}
+STOP & Exit the game \\
+\end{btnmap}
 \end{table}
+
 In game A, the maze stays the same, in Game B
 after an increasing number of apples eaten the maze is replaced by a
 new one.
diff --git a/manual/plugins/sokoban.tex b/manual/plugins/sokoban.tex
index 88c105b74d..cc8679619e 100644
--- a/manual/plugins/sokoban.tex
+++ b/manual/plugins/sokoban.tex
@@ -7,16 +7,15 @@ can only be pushed, never pulled, and only one can be pushed at a time.
 
 The controls are:
 
-\begin{table}[h!]
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action} \\\midrule
+\begin{table}
+\begin{btnmap}{}{}
 UP/DOWN/LEFT/RIGHT & Move the ``sokoban'' up, down, left or right \\
 F1 & Back to previous level \\
 F2 & Restart level \\
 F3 & Go to next level \\
 ON & Undo last movement \\
-OFF & Exit sokoban \\\bottomrule
-\end{tabular}
+OFF & Exit sokoban \\
+\end{btnmap}
 \end{table}
 
 
diff --git a/manual/plugins/star.tex b/manual/plugins/star.tex
index 736860a1da..9d77378705 100644
--- a/manual/plugins/star.tex
+++ b/manual/plugins/star.tex
@@ -10,15 +10,12 @@ which can take ``o''s, and the filled square, which is used as a mobile
 wall to allow your filled circle to get to places on the screen it
 could not otherwise reach. The block cannot take ``o''s.
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action} \\\midrule
+\begin{table}
+\begin{btnmap}{}{}
 ON & Toggle control \\
 F1 & Previous level \\
 F2 & Reset level \\
 F3 & Next level \\
-OFF & Exit the game \\\bottomrule
-\end{tabular}
-\end{center}
+OFF & Exit the game \\
+\end{btnmap}
 \end{table}
diff --git a/manual/plugins/starfield.tex b/manual/plugins/starfield.tex
index 8c3c67dedc..883566c685 100644
--- a/manual/plugins/starfield.tex
+++ b/manual/plugins/starfield.tex
@@ -2,10 +2,8 @@
 \screenshot{plugins/images/ss-starfield}{Starfield}{fig:starfield}
 Starfield simulation (like the classic screensaver).
 
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
+\begin{table}
+    \begin{btnmap}{}{}
     Right & Increase number of stars\\
     Left & Decrease number of stars\\
     \opt{recorder,recorderv2fm,ondio,h1xx,h300}{Up}
@@ -17,7 +15,6 @@ Starfield simulation (like the classic screensaver).
     \opt{recorder,recorderv2fm,h1xx,h300}{Stop}
     \opt{ondio}{Off}
     \opt{ipodcolor,ipodnano,ipodvideo}{Menu}
-    & Quit\\\bottomrule
-    \end{tabular}
-    \end{center}
+    & Quit\\
+    \end{btnmap}
 \end{table}
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index c5f555284e..c5a26aea2c 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -5,9 +5,8 @@ A simple stopwatch program with support for saving times.
 
 \subsubsection{Keys are as follows:}
 
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action}\\\midrule
+\begin{table}
+\begin{btnmap}{}{}
 \opt{player}{Menu}\opt{recorder,recorderv2fm}{Off}
 \opt{ondio}{OnOff}\opt{h1xx,h300}{Stop}
 \opt{ipodcolor,ipodnano}{Menu} 
@@ -23,6 +22,6 @@ A simple stopwatch program with support for saving times.
 & Take lap time \\
 \opt{player,h1xx,h300,ipodcolor,ipodnano}{Left/Right}
 \opt{recorder,recorderv2fm}{Down/Up} 
-& Scroll through lap times \\\bottomrule
-\end{tabular}
-\end{center}
+& Scroll through lap times \\
+\end{btnmap}
+\end{table}
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index ab091856e3..5cbdebde59 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -15,10 +15,8 @@ button, the number will then be added on the left.
 The column is stored seperatly for every cell on the board.
 These are \textbf{NOT} saved when saving the game.
 
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
+\begin{table}
+    \begin{btnmap}{}{}
     Direction keys & Move the cursor\\
     \opt{recorder,recorderv2fm}{PLAY}
     \opt{ondio}{MODE (increment once) / MODE+DOWN (toggle repeat)}
@@ -33,9 +31,8 @@ These are \textbf{NOT} saved when saving the game.
     & Add / remove number to scratchpad\\
     \opt{recorder,recorderv2fm,h1xx,h300}{STOP}\opt{ondio}{OFF}
     \opt{ipodcolor,ipodnano}{SELECT} 
-    & Quit\\\bottomrule
-    \end{tabular}
-    \end{center}
+    & Quit\\
+    \end{btnmap}
 \end{table}
 
 Some places where can you can find .ss files:
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 60ef396993..f35994dac3 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -2,111 +2,132 @@
 This is a Viewer for text files with word wrap. Just open a .txt file to
 display it. The text vewer features controls to handle various styles of text
 formatting, has top{}-of{}-file and bottom{}-of{}-file buttons. You can view
-files without a \fname{.txt} extension by using \textbf{Open with} from the
-\textbf{File Menu} (see page \pageref{ref:Filemenu}).
+files without a \fname{.txt} extension by using \emph{Open with} from the
+\emph{File Menu} (see page \pageref{ref:Filemenu}).
 
 \subsubsection{Mode settings}
 
-\begin{itemize}
-\item\textbf{Word mode} toggles between Wrap and Chop.
-    \begin{itemize}
-        \item\textbf{Wrap} breaks lines at white space or hyphen.
-        \item\textbf{Chop} breaks lines at the maximum column limit.
-    \end{itemize}  
-\item\textbf{Line mode} cycles through Normal, Join and Expand.
-    \begin{itemize}
-        \item\textbf{Normal} breaks lines at newline characters.
-        \item\textbf{Join} ignores unpaired newline characters  (i.e., joins lines). Useful for adopting the orphans that occur with e{}-mail style (i.e.,pre{}-wrapped) text files.
-        \item\textbf{Expand} doubles unpaired newlines (i.e., adds a blank line). Useful for making the paragraphs clearer in some book style text files.
-    \end{itemize}
-\item\textbf{View mode} toggles between Narrow and Wide.
-    \begin{itemize}
-        \item\textbf{Narrow} sets maximum column to the screen width.
-        \item\textbf{Wide} sets maximum column to 114. Useful for navigating large files. (Currently, Wide and Join cannot be selected together.)
-    \end{itemize}
+\begin{description}
+\item[Word mode] toggles between Wrap and Chop.
+    \begin{description}
+        \item[Wrap] breaks lines at white space or hyphen.
+        \item[Chop] breaks lines at the maximum column limit.
+    \end{description}  
+\item[Line mode] cycles through Normal, Join and Expand.
+    \begin{description}
+        \item[Normal] breaks lines at newline characters.
+        \item[Join] ignores unpaired newline characters (i.e., joins lines).
+        Useful for adopting the orphans that occur with e{}-mail style
+        (i.e.,pre{}-wrapped) text files.
+        \item[Expand] doubles unpaired newlines (i.e., adds a blank line).
+        Useful for making the paragraphs clearer in some book style text files.
+    \end{description}
+\item[View mode] toggles between Narrow and Wide.
+    \begin{description}
+        \item[Narrow] sets maximum column to the screen width.
+        \item[Wide] sets maximum column to 114. Useful for navigating large files. (Currently, Wide and Join cannot be selected together.)
+    \end{description}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{
-\item\textbf{Page mode} toggles between Normal and Overlap.
-    \begin{itemize}
-        \item\textbf{Normal} sets page{}-down/page{}-up to one full screen.
-        \item\textbf{Overlap} tells page{}-down/page{}-up to retain one line from previous screen.    
-    \end{itemize}
-\item\textbf{Scrollbar mode} toggles scrollbar for the current View mode.
-    \begin{itemize}
-        \item\textbf{Narrow mode} has no scrollbar by default, until toggled.
-        \item\textbf{Wide mode} has a scrollbar by default, until toggled.
-    \end{itemize}
+\item[Page mode] toggles between Normal and Overlap.
+    \begin{description}
+        \item[Normal] sets page{}-down/page{}-up to one full screen.
+        \item[Overlap] tells page{}-down/page{}-up to retain one line from previous screen.    
+    \end{description}
+\item[Scrollbar mode] toggles scrollbar for the current View mode.
+    \begin{description}
+        \item[Narrow mode] has no scrollbar by default, until toggled.
+        \item[Wide mode] has a scrollbar by default, until toggled.
+    \end{description}
 }
-\end{itemize}
+\end{description}
 Settings are not remembered after the viewer has been exited.
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{
 If file fits on one screen, there is no scrollbar and toggling Scrollbar mode has no effect.}
 
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
-    \opt{PLAYER_PAD}{\ButtonLeft}\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
-        {\ButtonUp}\opt{IPOD_4G_PAD}{\ButtonScrollBack} & Page{}-up (one screen up)\\
+\begin{table}
+    \begin{btnmap}{}{}
+    \opt{PLAYER_PAD}{\ButtonLeft}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
+    \opt{IPOD_4G_PAD}{\ButtonScrollBack} 
+        & Page{}-up (one screen up)\\
         
-    \opt{PLAYER_PAD}{\ButtonRight}\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
-        {\ButtonDown}\opt{IPOD_4G_PAD}{\ButtonScrollFwd} & Page{}-down (one screen down)\\
+    \opt{PLAYER_PAD}{\ButtonRight}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown}
+    \opt{IPOD_4G_PAD}{\ButtonScrollFwd} 
+    & Page{}-down (one screen down)\\
         
     \opt{PLAYER_PAD}{\ButtonMenu+\ButtonLeft}
-        \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}
-        {\ButtonLeft} & Top of file (Narrow mode) One screen left (Wide mode)\\
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonLeft} 
+    & Top of file (Narrow mode) One screen left (Wide mode)\\
         
     \opt{PLAYER_PAD}{\ButtonMenu+\ButtonRight}
-        \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}
-        {\ButtonRight} & Bottom of file (Narrow mode) One screen right (Wide mode)\\
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}
+        {\ButtonRight} 
+    & Bottom of file (Narrow mode) One screen right (Wide mode)\\
         
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonUp & One line up\\}
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
+       {\ButtonOn+\ButtonUp & One line up\\}
     
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonDown & One line down\\}
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
+       {\ButtonOn+\ButtonDown & One line down\\}
     
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonLeft & One column left\\}
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
+       {\ButtonOn+\ButtonLeft & One column left\\}
         
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonRight & One column right\\}
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
+       {\ButtonOn+\ButtonRight & One column right\\}
         
-    \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft}\opt{RECORDER_PAD}{\ButtonFOne}
-        \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-        \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}\opt{IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft}
+    \opt{RECORDER_PAD}{\ButtonFOne}
+    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
+    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}\opt{IAUDIO_X5_PAD}{\ButtonPlay}
         & Toggles Word mode\\
         
-    \opt{PLAYER_PAD}{\ButtonOn+\ButtonMenu+\ButtonRight}\opt{RECORDER_PAD}{\ButtonFTwo}
-        \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-        \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}\opt{IAUDIO_X5_PAD}{Long press on \ButtonPlay}
+    \opt{PLAYER_PAD}{\ButtonOn+\ButtonMenu+\ButtonRight}
+    \opt{RECORDER_PAD}{\ButtonFTwo}
+    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
+    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+    \opt{IAUDIO_X5_PAD}{Long press on \ButtonPlay}
         & Cycles line mode\\
         
-    \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight}\opt{RECORDER_PAD}{\ButtonFThree}
-        \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
-        \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
+    \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight}
+    \opt{RECORDER_PAD}{\ButtonFThree}
+    \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
         & Toggles view mode\\
         
     \opt{RECORDER_PAD}{\ButtonOn+\ButtonFOne & Toggles page mode\\}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown & Toggles page mode\\}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonMode & Toggles page mode\\}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu+\ButtonLeft & Toggles page mode\\}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}
+        {\ButtonOn+\ButtonMode & Toggles page mode\\}
+    \opt{IPOD_4G_PAD}
+        {\ButtonSelect+\ButtonMenu+\ButtonLeft & Toggles page mode\\}
         
     \opt{RECORDER_PAD}{\ButtonOn+\ButtonFThree & Toggles scrollbar mode\\}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff & Toggles scrollbar mode\\}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonRec & Toggles scrollbar mode\\}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft+\ButtonRight & Toggles scrollbar mode\\}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}
+        {\ButtonOn+\ButtonRec & Toggles scrollbar mode\\}
+    \opt{IPOD_4G_PAD}
+        {\ButtonSelect+\ButtonLeft+\ButtonRight & Toggles scrollbar mode\\}
         
-    \opt{PLAYER_PAD}{\ButtonStop}\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
-        {\ButtonOff}\opt{IPOD_4G_PAD}{\ButtonMenu}\opt{IAUDIO_X5_PAD}{\ButtonPower}
-        & Exit text viewer\\\bottomrule
-    \end{tabular}
-    \end{center}
+    \opt{PLAYER_PAD}{\ButtonStop}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
+    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IAUDIO_X5_PAD}{\ButtonPower}
+        & Exit text viewer\\
+    \end{btnmap}
 \end{table}
 
 \subsubsection{Compatibility}
 
 \begin{itemize}
 \item Correctly reads plain text files in Unix, Win/DOS, or Macintosh
-format. Latin{}-alphabet Unicode files are  a l m o s t  r e a d a b l
-e.
+format. Latin{}-alphabet Unicode files are  \emph{almost} readable.
 \item Currently prefers fixed{}-width fonts. With proportional fonts,
-pretends all characters are the width of a lower{}-case 'o'.
+pretends all characters are the width of a lower{}-case `o'.
 \item Currently messages are in English 
 \item Does not currently support right{}-to{}-left languages.
 \end{itemize}
diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex
index fe07180ecd..aedbb348d5 100644
--- a/manual/plugins/vumeter.tex
+++ b/manual/plugins/vumeter.tex
@@ -9,10 +9,8 @@ of small meters in addition to the main display (as above).  From the
 settings menu the decay time for the meter (its memory), the meter type
 and the meter scale can be changed. 
 
-\begin{table}[h!]
-\begin{center}
-\begin{tabular}{@{}ll@{}}\toprule
-\textbf{Key} & \textbf{Action} \\\midrule
+\begin{table}
+\begin{btnmap}{}{}
 \opt{recorder,recorderv2fm}{OFF}\opt{ondio}{ON/OFF}
 \opt{h1xx,h300}{Stop}\opt{ipodcolor,ipodnano}{Unknown} 
 & Save settings and quit \\
@@ -23,8 +21,7 @@ and the meter scale can be changed.
 \opt{h1xx,h300,ipodcolor,ipodnano}{Unknown} 
 & Settings \\
 UP & Raise Volume \\
-DOWN & Lower Volume \\\bottomrule
-\end{tabular}
-\end{center}
+DOWN & Lower Volume \\
+\end{btnmap}
 \end{table}
 
diff --git a/manual/plugins/wormlet.tex b/manual/plugins/wormlet.tex
index d007f9ad71..ffdecdffd5 100644
--- a/manual/plugins/wormlet.tex
+++ b/manual/plugins/wormlet.tex
@@ -15,18 +15,15 @@ possible using a remote control.\\}
 {\bfseries
 Menu controls:}
 
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
+\begin{table}
+    \begin{btnmap}{}{}
     \ButtonLeft\ / \ButtonRight & Controls number of worms in the game\\
     \opt{RECORDER_PAD}{
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
             {\ButtonUp\ / \ButtonDown}
             \opt{IPOD_4G_PAD}{\ButtonMenu\ / \ButtonPlay} & Selects number of players\\
         \ButtonFOne & Selects game mode.\\}\bottomrule
-    \end{tabular}
-    \end{center}
+    \end{btnmap}
 \end{table}
 
 %The following table is only for the recorder version of the game, since the
@@ -64,16 +61,14 @@ Game controls:}
 3 & Remote control & on \dap\ \ButtonLeft: turn left \ButtonRight: turn right
                         & on remote control VOL DOWN: turn left VOL UP: turn
                         right & on \dap\ \ButtonFTwo: turn left \ButtonFThree:
-                        turn right \\\bottomrule
+                        turn right \\
 \end{tabularx}
 \renewcommand{\arraystretch}{1.0}
 }
 
 \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}{
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
+\begin{table}
+    \begin{btnmap}{}{}
     \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}
         {\ButtonLeft} & Turn left\\
     \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}
@@ -81,9 +76,8 @@ Game controls:}
     \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
         \opt{IPOD_4G_PAD}{\ButtonMenu} & Turn Up\\
     \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonLeft}
-        \opt{IPOD_4G_PAD}{\ButtonPlay} & Turn Down\\\bottomrule
-    \end{tabular}
-    \end{center}
+        \opt{IPOD_4G_PAD}{\ButtonPlay} & Turn Down\\
+    \end{btnmap}
 \end{table}
 }
 
@@ -93,34 +87,33 @@ food. Worms do not stop moving except when dead. Dead worms are no fun.
 Be careful as your worm will try to eat anything that you steer it
 across. It won't distinguish whether it's edible or not.
 
-\begin{itemize}
-\item \textbf{Food}
+\begin{description}
+\item[Food.]
 The small square hollow pieces are food. Move the worm over a food tile
 to eat it. After eating the worm grows. Each time a piece of food has
 been eaten a new piece of food will pop up somewhere. Unfortunately for
 each new piece of food that appears two new ``argh'' pieces will
 appear, too.
-\item \textbf{Argh}
+\item[Argh.]
 An ``argh'' is a black square poisoned piece {}- slightly bigger than
 food {}- that makes a worm say ``Argh!'' when
 run into.  A worm that eats an ``argh'' is dead. Thus eating an
 ``argh'' must be avoided under any circumstances. ``Arghs'' have the
 annoying tendency to accumulate. 
-\item \textbf{Worms}
+\item[Worms.]
 Thou shall not eat worms. Neither other worms nor thyself. Eating worms
 is blasphemous cannibalism, not healthy and causes instant
 death. And it doesn't help anyway: the other worm
 isn't hurt by the bite. It will go on creeping happily
 and eat all the food you left on the table. 
-\item \textbf{Walls}
+\item[Walls.]
 Don't crash into the walls. Walls are not edible.
 Crashing a worm against a wall causes it a headache it
 doesn't survive. 
-\item \textbf{Game over}
-
+\item[Game over.]
 The game is over when all worms are dead. The longest worm wins the
 game. 
-\item \textbf{Pause the game}
+\item [Pause the game.]
 Press
 \opt{RECORDER_PAD}{\ButtonPlay}\opt{ONDIO_PAD}{\ButtonMenu}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{\ButtonSelect}
@@ -129,7 +122,7 @@ to pause the game. Hit
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{\ButtonSelect}
 again to resume the game.
 
-\item \textbf{Stop the game}
+\item[Stop the game.]
 There are two ways to stop a running game.
 
 \begin{itemize}
@@ -150,7 +143,7 @@ games menu you can hit
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD}{\ButtonMenu+\ButtonSelect}. A stopped game can not be resumed. 
 \end{itemize}
-\end{itemize}
+\end{description}
 
 \subsubsection{The scoreboard}
 On the right side of the game field is the score board. For each worm it
@@ -158,37 +151,37 @@ displays its status and its length. The top most entry displays the
 state of worm 1, the second worm 2 and the third worm 3. When a worm
 dies it's entry on the score board turns black.
 
-\begin{itemize}
-\item \textbf{Len:}
+\begin{description}
+\item[Len:]
 Here the current length of the worm is displayed. When a worm is eating
 food it grows by one pixel for each step it moves. 
 
-\item \textbf{Hungry:}
+\item[Hungry:]
 That's the normal state of a worm. Worms are always
 hungry and want to eat. It's good to have a hungry
 worm since it means that your worm is alive. But it's
 better to get your worm growing. 
 
-\item \textbf{Growing:}
+\item[Growing:]
 When a worm has eaten a piece of food it starts growing. For each step
 it moves over food it can grow by one pixel. One piece of food lasts
 for 7 steps. After your worm has moved 7 steps the food is used up. If
 another piece of food is eaten while growing it will increase the size
 of the worm for another 7 steps. 
 
-\item \textbf{Crashed:}
+\item[Crashed:]
 This indicates that a worm has crashed against a wall.
 
-\item \textbf{Argh:}
+\item[Argh:]
 If the score board entry displays ``Argh!'' it
 means the worm is dead because it tried to eat an ``argh''. Until we
 can make the worm say ``Argh!'' it's your job to say ``Argh!'' aloud.
 
-\item \textbf{Wormed:}
+\item[Wormed:]
 The worm tried to eat another worm or even itself.
 That's why it's dead now.  Making traps for other players with a worm
 is a good way to get them out of the game.
-\end{itemize}
+\end{description}
 
 \subsubsection{Hints}
 
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index 98deac594d..a82744da32 100644
--- a/manual/plugins/xobox.tex
+++ b/manual/plugins/xobox.tex
@@ -4,14 +4,16 @@ Xobox is a simple clone of the well known arcade game Qix.
 The aim of the game is to section off parts of the arena with your trail in
 order to remove that section from the game. Be careful not to get in the way of
 enemy balls because, if they hit you or your trail, you lose a life.
-To finish a level you have to section off more than 75\%.\\
-\begin{table}[ht!]
-    \begin{center}
-    \begin{tabular}{ll}\toprule
-    \textbf{Key} & \textbf{Action}\\\midrule
-    Directions & Move the player\\
-    \opt{h1xx,h300}{A-B}\opt{ipodcolor,ipodnano,ipodvideo}{Select} & Pause\\
-    \opt{h1xx,h300}{Stop}\opt{ipodcolor,ipodnano,ipodvideo}{Menu+Select} & Quit\\\bottomrule
-    \end{tabular}
-    \end{center}
+To finish a level you have to section off more than 75\%.
+
+\begin{table}
+\begin{btnmap}{The Xobox plugin}{tab:xobox}
+    \opt{h1xx,h300}{A-B}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Select} 
+    & Pause\\
+    \opt{h1xx,h300}{Stop}
+    \opt{ipodcolor,ipodnano,ipodvideo}{Menu+Select} 
+    & Quit\\
+\end{btnmap}
 \end{table}
+
diff --git a/manual/preamble.tex b/manual/preamble.tex
index bc69194b54..76fef710e0 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -138,3 +138,28 @@
 \setcounter{bottomnumber}{2} % default: 1
 \setcounter{totalnumber}{5}  % default: 3
 
+% command to set the default table heading for button lists
+\newcommand{\btnhead}{\textbf{Key} & \textbf{Action} \\\midrule}
+
+% environment intended to be used with button maps
+% usage: \begin{btnmap}{caption}{label} Button & ButtonAction \\ \end{btnmap}
+% Note: this automatically sets the table lines.
+% Note: you *need* to terminate the last line with a linebreak \\
+% Note: you still need to enclose this with \begin{table} / \end{table}
+% Cheers for the usenet helping me building this up :)
+\newenvironment{btnmap}[2]{%
+  \expandafter\let\expandafter\SavedEndTab\csname endtabular*\endcsname
+  \expandafter\renewcommand\expandafter*\csname endtabular*\endcsname{%
+    \bottomrule
+    \SavedEndTab%
+    \if\given{#1}\caption{#1}\fi%
+    \if\given{#2}\label{#2}\fi%
+    \endcenter%
+  }
+  \center
+\tabularx{.75\textwidth}{lX}\toprule % here is the table width defined
+  \btnhead
+}{%
+  \endtabularx
+}
+