Index: manual/plugins/chess_clock.tex
===================================================================
--- manual/plugins/chess_clock.tex	(Revision 25077)
+++ manual/plugins/chess_clock.tex	(Arbeitskopie)
@@ -5,8 +5,7 @@
 used in any kind of game with up to ten players.
 
 \subsubsection{Setup}
-\begin{table}
-  \begin{btnmap}{}{}
+  \begin{btnmap}
     \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
         ,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD}
         {\ButtonRight{} / \ButtonLeft}
@@ -34,7 +33,6 @@
        \opt{HAVEREMOTEKEYMAP}{& }
       & Move to previous screen\\
   \end{btnmap}
-\end{table}
 
 \begin{itemize}
   \item First enter the number of players (1--10)
@@ -52,8 +50,7 @@
 
 Keys are as follows:
 
-\begin{table}
-  \begin{btnmap}{}{}
+  \begin{btnmap}
     \opt{PLAYER_PAD}{\ButtonOn}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
@@ -117,7 +114,6 @@
             {(\ButtonSelect\ to select.)}%
         \opt{IAUDIO_X5_PAD}{(press again to select.)}\\
   \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. When the round time
 is up for a player the message ``ROUND UP!'' is shown (press  NEXT to
Index: manual/plugins/vumeter.tex
===================================================================
--- manual/plugins/vumeter.tex	(Revision 25077)
+++ manual/plugins/vumeter.tex	(Arbeitskopie)
@@ -9,8 +9,7 @@
 settings menu the decay time for the meter (its memory), the meter type
 and the meter scale can be changed.
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
 \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
 \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
@@ -57,4 +56,3 @@
   \opt{HAVEREMOTEKEYMAP}{& }
     & Lower Volume\\
 \end{btnmap}
-\end{table}
Index: manual/plugins/jewels.tex
===================================================================
--- manual/plugins/jewels.tex	(Revision 25077)
+++ manual/plugins/jewels.tex	(Arbeitskopie)
@@ -12,8 +12,7 @@
 
 In the mode puzzle the aim of the game is to connect the puzzles, by skilful swapping pairs of jewels.
 
-\begin{table}
-  \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,IRIVER_H10_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
         ,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
         ,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD}
@@ -46,5 +45,4 @@
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
        \opt{HAVEREMOTEKEYMAP}{& }
      & Menu \\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/calculator.tex
===================================================================
--- manual/plugins/calculator.tex	(Revision 25077)
+++ manual/plugins/calculator.tex	(Arbeitskopie)
@@ -6,8 +6,7 @@
 standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle between
  other available math functions.
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD%
       ,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
       ,GIGABEAT_S_PAD,MROBE100_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD}
@@ -77,4 +76,3 @@
        }
     & Quit\\
 \end{btnmap}
-\end{table}
Index: manual/plugins/sliding.tex
===================================================================
--- manual/plugins/sliding.tex	(Revision 25077)
+++ manual/plugins/sliding.tex	(Arbeitskopie)
@@ -11,8 +11,7 @@
 
 Key controls:
 
-\begin{table}
-  \begin{btnmap}{}{}
+\begin{btnmap}
   \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
       ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
       ,MROBE100_PAD}
@@ -62,5 +61,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
   & Stop the game \\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/wormlet.tex
===================================================================
--- manual/plugins/wormlet.tex	(Revision 25077)
+++ manual/plugins/wormlet.tex	(Arbeitskopie)
@@ -53,8 +53,7 @@
 }
 
 \nopt{RECORDER_PAD}{
-\begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
         \opt{ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
             ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
             ,GIGABEAT_S_PAD,MROBE100_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD}
@@ -86,7 +85,6 @@
            \opt{HAVEREMOTEKEYMAP}{& }
         & Turn Down\\
     \end{btnmap}
-\end{table}
 }
 
 \subsubsection{The game}
Index: manual/plugins/clock.tex
===================================================================
--- manual/plugins/clock.tex	(Revision 25077)
+++ manual/plugins/clock.tex	(Arbeitskopie)
@@ -5,8 +5,7 @@
 
 \subsubsection{Key configuration}
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD%
         ,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD}
@@ -60,7 +59,6 @@
        \opt{HAVEREMOTEKEYMAP}{& }
     & Save Settings (if enabled) and Exit \\
 \end{btnmap}
-\end{table}
 
 \textbf{Clock Menu}
 \begin{description}
Index: manual/plugins/xobox.tex
===================================================================
--- manual/plugins/xobox.tex	(Revision 25077)
+++ manual/plugins/xobox.tex	(Arbeitskopie)
@@ -7,8 +7,7 @@
 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}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay,}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
         ,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
@@ -40,4 +39,3 @@
   \opt{HAVEREMOTEKEYMAP}{& }
     & Open menu\\
 \end{btnmap}
-\end{table}
Index: manual/plugins/bmpviewer.tex
===================================================================
--- manual/plugins/bmpviewer.tex	(Revision 25077)
+++ manual/plugins/bmpviewer.tex	(Arbeitskopie)
@@ -12,8 +12,7 @@
 \note{This plugin will cause playback to stop.}%
 }%
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
       ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
       ,MROBE100_PAD}
@@ -96,7 +95,6 @@
         & Quit the viewer \\
     }
 \end{btnmap}
-\end{table}
 
 The menu has the following entries.
 \begin{description}
Index: manual/plugins/pong.tex
===================================================================
--- manual/plugins/pong.tex	(Revision 25077)
+++ manual/plugins/pong.tex	(Arbeitskopie)
@@ -2,8 +2,7 @@
 \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}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_FUZE_PAD}{\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD%
@@ -54,5 +53,4 @@
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/dice.tex
===================================================================
--- manual/plugins/dice.tex	(Revision 25077)
+++ manual/plugins/dice.tex	(Arbeitskopie)
@@ -3,8 +3,7 @@
 in a menu and start by choosing ``Roll Dice''. The result is shown as individual
 numbers as well as the total of the rolled dice.
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{GIGABEAT_PAD}{\ButtonA}
@@ -28,5 +27,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
         & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/frotz.tex
===================================================================
--- manual/plugins/frotz.tex	(Revision 25077)
+++ manual/plugins/frotz.tex	(Arbeitskopie)
@@ -33,8 +33,7 @@
 \url{http://www.microheaven.com/IFGuide/}
 \end{itemize}
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -67,5 +66,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
             }
         & Open Frotz menu (not available at MORE prompts)\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/mpegplayer.tex
===================================================================
--- manual/plugins/mpegplayer.tex	(Revision 25077)
+++ manual/plugins/mpegplayer.tex	(Arbeitskopie)
@@ -8,8 +8,7 @@
 supported format, you will need to use the \setting{Open With...} context menu
 option and choose \setting{mpegplayer}.
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \opt{GIGABEAT_S_PAD}{\ButtonSelect{} or \ButtonPlay}
     \opt{GIGABEAT_PAD}{\ButtonSelect{} or \ButtonA}
     \nopt{GIGABEAT_S_PAD,GIGABEAT_PAD}{\ActionWpsPlay}
@@ -35,7 +34,6 @@
        \opt{HAVEREMOTEKEYMAP}{& }
     & Open the MPEG Player menu\\
 \end{btnmap}
-\end{table}
 
 When a video file is selected, the start Menu will be displayed, unless it is 
 disabled via the option "start menu" (see below). In the latter case the video 
Index: manual/plugins/plasma.tex
===================================================================
--- manual/plugins/plasma.tex	(Revision 25077)
+++ manual/plugins/plasma.tex	(Arbeitskopie)
@@ -3,8 +3,7 @@
 \screenshot{plugins/images/ss-plasma}{Plasma}{img:plasma}
 Plasma is a demo displaying a 80's style retro plasma effect.
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
     \opt{COWON_D2_PAD}{\TouchMidLeft{} / \TouchMidRight}
@@ -33,5 +32,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/cube.tex
===================================================================
--- manual/plugins/cube.tex	(Revision 25077)
+++ manual/plugins/cube.tex	(Arbeitskopie)
@@ -1,8 +1,7 @@
 \subsection{Cube}
 \screenshot{plugins/images/ss-cube}{Cube}{img:cube}
 This is a rotating cube screen saver in 3D.
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
@@ -61,5 +60,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
         & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/random_folder_advance_config.tex
===================================================================
--- manual/plugins/random_folder_advance_config.tex	(Revision 25077)
+++ manual/plugins/random_folder_advance_config.tex	(Arbeitskopie)
@@ -26,8 +26,7 @@
 \end{description}
 
 \subsubsection{Folder List Editor Keys}
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \ActionStdOk{} 
         \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdOk} 
      & Delete selected folder\\
@@ -42,4 +41,3 @@
     & Exit\\
 
 \end{btnmap}
-\end{table}
Index: manual/plugins/disktidy.tex
===================================================================
--- manual/plugins/disktidy.tex	(Revision 25077)
+++ manual/plugins/disktidy.tex	(Arbeitskopie)
@@ -20,10 +20,8 @@
     \item[Other] selects additional files added in by the user.
   \end{description}
   
-  \begin{table}
-    \begin{btnmap}{}{}
+  \begin{btnmap}
       \ActionStdCancel
         \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdCancel}
       & Exit / Abort\\
-    \end{btnmap}
-\end{table}
+  \end{btnmap}
Index: manual/plugins/goban.tex
===================================================================
--- manual/plugins/goban.tex	(Revision 25077)
+++ manual/plugins/goban.tex	(Arbeitskopie)
@@ -52,8 +52,7 @@
 \end{table}
 
 \subsubsection{Controls}
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_CLIP_PAD,SANSA_M200_PAD,SANSA_C200_PAD,%
          GIGABEAT_PAD,GIGABEAT_S_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,MROBE100_PAD,%
          IAUDIO_X5_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonUp}%
@@ -159,8 +158,7 @@
         \opt{COWON_D2_PAD}{\TouchTopRight}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Go to the next variation when at the first node in a branch \\ }
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 \subsubsection{Menus}
 \begin {description}
Index: manual/plugins/flipit.tex
===================================================================
--- manual/plugins/flipit.tex	(Revision 25077)
+++ manual/plugins/flipit.tex	(Arbeitskopie)
@@ -5,8 +5,7 @@
 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}
-\begin{btnmap}{}{}
+\begin{btnmap}
 \opt{PLAYER_PAD}{\ButtonOn{} / \ButtonMenu{} / \ButtonLeft{} / \ButtonRight}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
     ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
@@ -78,4 +77,3 @@
         }
     & Quit the game \\
 \end{btnmap}
-\end{table}
Index: manual/plugins/sokoban.tex
===================================================================
--- manual/plugins/sokoban.tex	(Revision 25077)
+++ manual/plugins/sokoban.tex	(Arbeitskopie)
@@ -11,8 +11,7 @@
 information about the level format, see
 \url{http://sokobano.de/wiki/index.php?title=Level_format}
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
 \multicolumn{2}{c}{\textbf{In game}} \\
 \hline
 \opt{RECORDER_PAD,ARCHOS_AV300_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
@@ -137,7 +136,6 @@
        \opt{HAVEREMOTEKEYMAP}{& }
     & Quit \\
 \end{btnmap}
-\end{table}
 
 Some places where can you can find level sets:
 \begin{itemize}
Index: manual/plugins/doom.tex
===================================================================
--- manual/plugins/doom.tex	(Revision 25077)
+++ manual/plugins/doom.tex	(Arbeitskopie)
@@ -76,8 +76,7 @@
 \end{description}
 
 \subsubsection{Keys}
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
       ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp}
   \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
@@ -157,7 +156,6 @@
     & Change Weapon \\
 %
 \end{btnmap}
-\end{table}
 
 \subsubsection{Playing the game}
 After installation of the \fname{wad} files is complete you can start the
Index: manual/plugins/codebuster.tex
===================================================================
--- manual/plugins/codebuster.tex	(Revision 25077)
+++ manual/plugins/codebuster.tex	(Arbeitskopie)
@@ -9,8 +9,7 @@
 a correct peg in the correct position, and a white peg signifies a correct
 peg in the wrong position.
 
-\begin{table}
-  \begin{btnmap}{}{}
+  \begin{btnmap}
     \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
     \opt{IPOD_4G_PAD}{\ButtonMenu}
@@ -38,4 +37,3 @@
       \opt{HAVEREMOTEKEYMAP}{& }
         & Change current peg \\
   \end{btnmap}
-\end{table}
Index: manual/plugins/logo.tex
===================================================================
--- manual/plugins/logo.tex	(Revision 25077)
+++ manual/plugins/logo.tex	(Arbeitskopie)
@@ -1,8 +1,7 @@
 % $Id$ %
 \subsection{Logo}
 Demo showing the Rockbox logo bouncing around the screen.
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
         ,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
@@ -32,5 +31,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/chopper.tex
===================================================================
--- manual/plugins/chopper.tex	(Revision 25077)
+++ manual/plugins/chopper.tex	(Arbeitskopie)
@@ -5,8 +5,7 @@
   Navigate a cavernous maze without banging into walls, the
   ceiling, or the floor. How long can you fly your chopper?
 
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \opt{RECORDER_PAD}{\ButtonPlay}%
       \opt{ONDIO_PAD}{\ButtonUp{} / \ButtonMenu}
       \opt{IRIVER_H10_PAD}{\ButtonRight}
@@ -28,4 +27,3 @@
        \opt{HAVEREMOTEKEYMAP}{& }
       & Enter menu\\
     \end{btnmap}
-\end{table}
Index: manual/plugins/brickmania.tex
===================================================================
--- manual/plugins/brickmania.tex	(Revision 25077)
+++ manual/plugins/brickmania.tex	(Arbeitskopie)
@@ -21,8 +21,7 @@
     \end{rbtabular}
 \end{table}
 
-\begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
     \opt{RECORDER_PAD,IAUDIO_X5_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
         ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,IPOD_4G_PAD%
         ,IPOD_3G_PAD,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD}
@@ -54,4 +53,3 @@
           }
     & Open menu / Quit\\
     \end{btnmap}
-\end{table}
Index: manual/plugins/split_editor.tex
===================================================================
--- manual/plugins/split_editor.tex	(Revision 25077)
+++ manual/plugins/split_editor.tex	(Arbeitskopie)
@@ -113,7 +113,7 @@
   \end{description}
 
   \begin{table}
-    \begin{btnmap}{Controls in the split editor}{}
+    \begin{btnmap}
       \ButtonOff & Quit plugin \\
       %
       \ButtonLeft\ / \ButtonRight &  Move the split point indicator \\
@@ -147,6 +147,7 @@
       & Play normal speed \\
     }
     \end{btnmap}
+	\caption{Controls in the split editor}
   \end{table}
 
 \subsubsection{Save dialogue}
@@ -163,7 +164,7 @@
 Save Dialogue}{}
 
 \begin{table}
-  \begin{btnmap}{Controls in the save dialogue}{}
+  \begin{btnmap}
     \ButtonUp\ / \ButtonDown & Select item \\
     %
     \opt{RECORDER_PAD}{\ButtonPlay}
@@ -172,6 +173,7 @@
     %
     \ButtonOff & Cancel \\
   \end{btnmap}
+  \caption{Controls in the save dialogue}
 \end{table}
 
 \subsubsection{\label{ref:Scalemode}Scale}
Index: manual/plugins/mazezam.tex
===================================================================
--- manual/plugins/mazezam.tex	(Revision 25077)
+++ manual/plugins/mazezam.tex	(Arbeitskopie)
@@ -12,8 +12,7 @@
 You start the game with three lives.
 Luckily, there are checkpoints at levels four and eight.
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \opt{IPOD_4G_PAD}{\ButtonMenu, \ButtonPlay,}
     \opt{IPOD_3G_PAD}{\ButtonScrollBack, \ButtonScrollFwd,}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD%
@@ -40,4 +39,3 @@
         }
     & Menu\\
 \end{btnmap}
-\end{table}
Index: manual/plugins/pngviewer.tex
===================================================================
--- manual/plugins/pngviewer.tex	(Revision 25077)
+++ manual/plugins/pngviewer.tex	(Arbeitskopie)
@@ -11,8 +11,7 @@
 \note{This plugin will cause playback to stop.}%
 }%
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
       ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
       ,MROBE100_PAD}
@@ -93,7 +92,6 @@
         & Quit the viewer \\
     }
 \end{btnmap}
-\end{table}
 
 The menu has the following entries.
 \begin{description}
Index: manual/plugins/alarmclock.tex
===================================================================
--- manual/plugins/alarmclock.tex	(Revision 25077)
+++ manual/plugins/alarmclock.tex	(Arbeitskopie)
@@ -3,8 +3,7 @@
 This plugin is an alarm clock, which resumes a paused song at a given time.
 
 \subsubsection{Key configuration}
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD%
         ,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD}
@@ -40,7 +39,6 @@
        \opt{HAVEREMOTEKEYMAP}{& }
     & Exit \\
 \end{btnmap}
-\end{table}
 
 \subsubsection{Setting an alarm}
 First select a track and play it, then pause the track and launch the 
Index: manual/plugins/rockboy.tex
===================================================================
--- manual/plugins/rockboy.tex	(Revision 25077)
+++ manual/plugins/rockboy.tex	(Arbeitskopie)
@@ -10,8 +10,7 @@
 }
 
 \subsubsection{Default keys}
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,GIGABEAT_S_PAD}{\ButtonUp{} / \ButtonDown}
@@ -88,8 +87,7 @@
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD}{\ButtonMenu}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Open Rockboy menu\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 \subsubsection{Rockboy menu}
 \begin{description}
Index: manual/plugins/stopwatch.tex
===================================================================
--- manual/plugins/stopwatch.tex	(Revision 25077)
+++ manual/plugins/stopwatch.tex	(Arbeitskopie)
@@ -3,8 +3,7 @@
 
 A simple stopwatch program with support for saving times.
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{PLAYER_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
@@ -51,5 +50,4 @@
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
   \opt{HAVEREMOTEKEYMAP}{& }
     & Scroll through lap times \\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/starfield.tex
===================================================================
--- manual/plugins/starfield.tex	(Revision 25077)
+++ manual/plugins/starfield.tex	(Arbeitskopie)
@@ -3,8 +3,7 @@
 \screenshot{plugins/images/ss-starfield}{Starfield}{img:starfield}
 Starfield simulation (like the classic screensaver).
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD%
         ,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD%
         ,SANSA_FUZE_PAD,SANSA_C200_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD}
@@ -39,5 +38,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
   }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/bubbles.tex
===================================================================
--- manual/plugins/bubbles.tex	(Revision 25077)
+++ manual/plugins/bubbles.tex	(Arbeitskopie)
@@ -8,8 +8,7 @@
 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}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -60,4 +59,3 @@
             }
         & Exit to menu\\
     \end{btnmap}
-\end{table}
Index: manual/plugins/rockblox.tex
===================================================================
--- manual/plugins/rockblox.tex	(Revision 25077)
+++ manual/plugins/rockblox.tex	(Arbeitskopie)
@@ -7,8 +7,7 @@
 gain points. For every ten lines completed, the game level increases, making
 the blocks fall faster. If the pile of blocks reaches the ceiling, the game is over.
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{PLAYER_PAD}{\ButtonStop+\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
@@ -100,5 +99,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
         & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/nim.tex
===================================================================
--- manual/plugins/nim.tex	(Revision 25077)
+++ manual/plugins/nim.tex	(Arbeitskopie)
@@ -6,12 +6,9 @@
 last match loses.  You can take up to twice as many matches as the
 \dap{} selected, and vice versa.
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
 \ButtonLeft \opt{HAVEREMOTEKEYMAP}{& } & Decrease the number of matches \\
 \ButtonRight \opt{HAVEREMOTEKEYMAP}{& } & Increase the number of matches \\
 \ButtonPlay \opt{HAVEREMOTEKEYMAP}{& } & Remove the number of matches you have selected \\
 \ButtonStop \opt{HAVEREMOTEKEYMAP}{& } & Exit the game \\
 \end{btnmap}
-\end{table}
-
Index: manual/plugins/snake2.tex
===================================================================
--- manual/plugins/snake2.tex	(Revision 25077)
+++ manual/plugins/snake2.tex	(Arbeitskopie)
@@ -7,8 +7,7 @@
 snake gets longer. The game ends when the snake hits a wall, or runs
 into itself.
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \multicolumn{2}{c}{\textbf{In menu}}\\\hline
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
@@ -73,8 +72,7 @@
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
   \opt{HAVEREMOTEKEYMAP}{& }
         & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 In game A, the maze stays the same, in game B
 after an increasing number of apples eaten the maze is replaced by a
Index: manual/plugins/fire.tex
===================================================================
--- manual/plugins/fire.tex	(Revision 25077)
+++ manual/plugins/fire.tex	(Arbeitskopie)
@@ -2,8 +2,7 @@
 \subsection{Fire}
 \screenshot{plugins/images/ss-fire}{Fire}{img:fire}
 Fire is a demo displaying a fire effect.
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
         {\ButtonUp\ / \ButtonDown}
@@ -40,5 +39,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/robotfindskitten.tex
===================================================================
--- manual/plugins/robotfindskitten.tex	(Revision 25077)
+++ manual/plugins/robotfindskitten.tex	(Arbeitskopie)
@@ -6,8 +6,7 @@
 Robot must touch items to determine if they are kitten or not. The game
 ends when robotfindskitten.
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay,}
     \opt{SANSA_E200_PAD}{\ButtonScrollFwd, \ButtonScrollBack,}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD%
@@ -35,4 +34,3 @@
        }
     & Quit\\
 \end{btnmap}
-\end{table}
Index: manual/plugins/invadrox.tex
===================================================================
--- manual/plugins/invadrox.tex	(Revision 25077)
+++ manual/plugins/invadrox.tex	(Arbeitskopie)
@@ -5,8 +5,7 @@
 Kill those pesky aliens before they get to you. Remember, they
 increase speed, drop down and reverse direction after every pass!
 
-\begin{table}
-  \begin{btnmap}{}{}
+\begin{btnmap}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
           ,IPOD_1G2G_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_E200_PAD%
           ,SANSA_FUZE_PAD,GIGABEAT_S_PAD,IRIVER_H10_PAD}
@@ -39,5 +38,4 @@
     \opt{COWON_D2_PAD}{\TouchTopLeft{} or \ButtonPower}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/rockpaint.tex
===================================================================
--- manual/plugins/rockpaint.tex	(Revision 25077)
+++ manual/plugins/rockpaint.tex	(Arbeitskopie)
@@ -103,8 +103,7 @@
 \warn{BE CAREFUL. Rockpaint will NOT prompt you to save
 if you select Exit, so any unsaved changes will be lost.}
 
-\begin{table}
-  \begin{btnmap}{}{}
+\begin{btnmap}
     \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{
         \nopt{IRIVER_H300_PAD,GIGABEAT_S_PAD,SANSA_FUZE_PAD}
             {\ButtonPower}
@@ -151,5 +150,4 @@
       \opt{HAVEREMOTEKEYMAP}{& }
     & Toggles the brush and selects objects.\\
 
-  \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/text_editor.tex
===================================================================
--- manual/plugins/text_editor.tex	(Revision 25077)
+++ manual/plugins/text_editor.tex	(Arbeitskopie)
@@ -18,8 +18,7 @@
 \end{itemize}
 \note{When you have not changed the file the Text Editor will quit immediately.}
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \ActionStdOk 
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdOk}
     & Edit Line / Select Character\\
@@ -35,6 +34,5 @@
     \ActionStdContext 
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext} 
     & Delete Line\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
Index: manual/plugins/solitaire.tex
===================================================================
--- manual/plugins/solitaire.tex	(Revision 25077)
+++ manual/plugins/solitaire.tex	(Arbeitskopie)
@@ -13,8 +13,7 @@
 visit
 \url{http://www.solitairecentral.com/rules/klondike.html}
 
-\begin{table}
-  \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD}
       {\ButtonUp{} / \ButtonDown}
@@ -106,5 +105,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
       & Show menu\\
-   \end{btnmap}
-  \end{table}
+\end{btnmap}
Index: manual/plugins/fractals.tex
===================================================================
--- manual/plugins/fractals.tex	(Revision 25077)
+++ manual/plugins/fractals.tex	(Arbeitskopie)
@@ -2,8 +2,7 @@
 \screenshot{plugins/images/ss-mandelbrot}{Mandelbrot}{img:mandelbrot}
 This demonstration draws fractal images from the Mandelbrot set%
 \opt{archos,h100}{ using the greyscale engine}.
-\begin{table}
-  \begin{btnmap}{}{}
+\begin{btnmap}
     Direction keys
     \opt{HAVEREMOTEKEYMAP}{&}
     & Move about the image\\
@@ -77,5 +76,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
     & Quit\\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/clix.tex
===================================================================
--- manual/plugins/clix.tex	(Revision 25077)
+++ manual/plugins/clix.tex	(Arbeitskopie)
@@ -5,8 +5,7 @@
 remove blocks, if at least two blocks with the same color have a direct connection.
 The more blocks you remove per turn, the more points you get.
 
-\begin{table}
-  \begin{btnmap}{}{}
+  \begin{btnmap}
     \nopt{touchscreen}{
     \opt{RECORDER_PAD,IRIVER_H10_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
       ,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
@@ -38,4 +37,3 @@
        \opt{HAVEREMOTEKEYMAP}{& }
      & Exit \\
   \end{btnmap}
-\end{table}
Index: manual/plugins/snake.tex
===================================================================
--- manual/plugins/snake.tex	(Revision 25077)
+++ manual/plugins/snake.tex	(Arbeitskopie)
@@ -5,8 +5,7 @@
 as possible by eating the dots that appear on the screen. The game will
 end when the snake touches either the borders of the screen or itself.
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
      \opt{RECORDER_PAD,IAUDIO_X5_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
       ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
       ,SANSA_FUZE_PAD}
@@ -27,5 +26,4 @@
        \opt{HAVEREMOTEKEYMAP}{& }
      & Toggle Play/Pause\\
     %
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/pictureflow.tex
===================================================================
--- manual/plugins/pictureflow.tex	(Revision 25077)
+++ manual/plugins/pictureflow.tex	(Arbeitskopie)
@@ -23,8 +23,7 @@
   \end{itemize}
 
 \subsubsection{Keys}
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
         \opt{scrollwheel,IRIVER_H10_PAD}{
             \ActionStdPrev{} / \ActionStdNext
                 &
@@ -113,8 +112,7 @@
         Exit PictureFlow
             \\
             
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 \subsubsection{Main Menu}
 \begin{description}
Index: manual/plugins/calendar.tex
===================================================================
--- manual/plugins/calendar.tex	(Revision 25077)
+++ manual/plugins/calendar.tex	(Arbeitskopie)
@@ -7,8 +7,7 @@
 
 You can select what day is first day of week by the setting \setting{First Day of Week} in the menu.
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,IPOD_4G_PAD%
         ,IPOD_3G_PAD,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD}
@@ -53,4 +52,3 @@
        \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
 \end{btnmap}
-\end{table}
Index: manual/plugins/star.tex
===================================================================
--- manual/plugins/star.tex	(Revision 25077)
+++ manual/plugins/star.tex	(Arbeitskopie)
@@ -10,8 +10,7 @@
 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}
-  \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,GIGABEAT_S_PAD,MROBE100_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD}
@@ -97,5 +96,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
         & Exit the game \\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/bounce.tex
===================================================================
--- manual/plugins/bounce.tex	(Revision 25077)
+++ manual/plugins/bounce.tex	(Arbeitskopie)
@@ -5,8 +5,7 @@
 In \setting{Scroll mode} the bouncing text is replaced by a different one
 scrolling from right to left.
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
     ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}
     {\ButtonUp\ /\ \ButtonDown}
@@ -43,7 +42,6 @@
        \opt{HAVEREMOTEKEYMAP}{& }
 & Exits bounce demo\\
 \end{btnmap}
-\end{table}
 
 Available options are:
 
Index: manual/plugins/pacbox.tex
===================================================================
--- manual/plugins/pacbox.tex	(Revision 25077)
+++ manual/plugins/pacbox.tex	(Arbeitskopie)
@@ -26,8 +26,7 @@
 found at \url{http://www.mame.net}.
 
 \subsubsection{Keys}
-\begin{table}
-  \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,%
         IPOD_3G_PAD,h10,MROBE100_PAD,SANSA_FUZE_PAD}{\ButtonRight}
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD}{\ButtonUp}
@@ -88,6 +87,4 @@
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD}{\ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Menu\\
-  \end{btnmap}
-\end{table}
-
+\end{btnmap}
Index: manual/plugins/minesweeper.tex
===================================================================
--- manual/plugins/minesweeper.tex	(Revision 25077)
+++ manual/plugins/minesweeper.tex	(Arbeitskopie)
@@ -10,8 +10,7 @@
 the location of a mine, it can be tagged to avoid accidentally
 ``stepping'' on it.
 
-\begin{table}
- \begin{btnmap}{}{}
+\begin{btnmap}
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay{} / \ButtonLeft{} / \ButtonRight}
   \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
       ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
@@ -77,4 +76,3 @@
         }
   & Exit the game \\
 \end{btnmap}
-\end{table}
Index: manual/plugins/pegbox.tex
===================================================================
--- manual/plugins/pegbox.tex	(Revision 25077)
+++ manual/plugins/pegbox.tex	(Arbeitskopie)
@@ -5,8 +5,7 @@
 pushed into each other they disappear except for triangles which form a solid 
 block and crosses which allow you to choose a replacement block.
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \multicolumn{2}{c}{\textbf{In game}}\\\hline
 
     \opt{RECORDER_PAD}{\ButtonUp, \ButtonDown, } 
@@ -118,6 +117,4 @@
       \opt{HAVEREMOTEKEYMAP}{& }
         & to quit\\
 
-    \end{btnmap}
-\end{table}
-
+\end{btnmap}
Index: manual/plugins/lamp.tex
===================================================================
--- manual/plugins/lamp.tex	(Revision 25077)
+++ manual/plugins/lamp.tex	(Arbeitskopie)
@@ -2,8 +2,7 @@
 \subsection{Lamp}
 Lamp is a simple plugin to use your player as a lamp (flashlight, torch).
 You get an empty screen with maximum brightness.
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{lcd_color}{
     \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
         ,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
@@ -23,5 +22,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
         & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/jackpot.tex
===================================================================
--- manual/plugins/jackpot.tex	(Revision 25077)
+++ manual/plugins/jackpot.tex	(Arbeitskopie)
@@ -4,8 +4,7 @@
 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}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,%
       MROBE100_PAD,SANSA_CLIP_PAD,M200,IPOD_3G_PAD,IPOD_4G_PAD,%
@@ -34,4 +33,3 @@
         }
     & Exit the game \\
 \end{btnmap}
-\end{table}
Index: manual/plugins/spacerocks.tex
===================================================================
--- manual/plugins/spacerocks.tex	(Revision 25077)
+++ manual/plugins/spacerocks.tex	(Arbeitskopie)
@@ -4,8 +4,7 @@
 is to blow up the asteroids and avoid being hit by them.  Once in a while, a
 UFO will appear -- shoot this for extra points.
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     %
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -68,5 +67,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/oscilloscope.tex
===================================================================
--- manual/plugins/oscilloscope.tex	(Revision 25077)
+++ manual/plugins/oscilloscope.tex	(Arbeitskopie)
@@ -11,8 +11,7 @@
 
 \subsubsection{Keys}
 
-\begin{table}
-  \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
@@ -85,5 +84,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
     & Exit demo \\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/metronome.tex
===================================================================
--- manual/plugins/metronome.tex	(Revision 25077)
+++ manual/plugins/metronome.tex	(Arbeitskopie)
@@ -3,8 +3,7 @@
 practice. Adjust the tempo through the interface or by tapping it out
 on the appropriate button.
 
-\begin{table}
-  \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IRIVER_H10_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
@@ -47,5 +46,4 @@
     \opt{COWON_D2_PAD}{\ButtonPlus{} / \ButtonMinus{} or \TouchTopMiddle{} / \TouchBottomMiddle}
        \opt{HAVEREMOTEKEYMAP}{& }
         & Adjust volume \\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/blackjack.tex
===================================================================
--- manual/plugins/blackjack.tex	(Revision 25077)
+++ manual/plugins/blackjack.tex	(Arbeitskopie)
@@ -12,8 +12,7 @@
 visit\\
 \url{http://www.blackjackinfo.com/blackjack-rules.php}
 
-\begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD}
       {\ButtonLeft{} / \ButtonRight{} / \ButtonUp{} / \ButtonDown}
@@ -61,4 +60,3 @@
        \opt{HAVEREMOTEKEYMAP}{& }
         & Pause game and go to menu / Cancel\\
     \end{btnmap}
-\end{table}
Index: manual/plugins/text_viewer.tex
===================================================================
--- manual/plugins/text_viewer.tex	(Revision 25077)
+++ manual/plugins/text_viewer.tex	(Arbeitskopie)
@@ -6,8 +6,7 @@
 \emph{Context Menu} (see \reference{ref:Contextmenu}).
 
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{PLAYER_PAD}{\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,SANSA_E200_PAD,SANSA_FUZE_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonUp}
@@ -117,8 +116,7 @@
   }
         & Exit text viewer\\
 
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 \subsubsection{The Viewer's Menu}
 
Index: manual/plugins/jpegviewer.tex
===================================================================
--- manual/plugins/jpegviewer.tex	(Revision 25077)
+++ manual/plugins/jpegviewer.tex	(Arbeitskopie)
@@ -12,8 +12,7 @@
 \note{This plugin will cause playback to stop.}%
 }%
 
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
       ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
       ,MROBE100_PAD}
@@ -96,7 +95,6 @@
         & Quit the viewer \\
     }
 \end{btnmap}
-\end{table}
 
 The menu has the following entries.
 \begin{description}
Index: manual/plugins/rockblox1d.tex
===================================================================
--- manual/plugins/rockblox1d.tex	(Revision 25077)
+++ manual/plugins/rockblox1d.tex	(Arbeitskopie)
@@ -5,8 +5,7 @@
 second dimension is missing so the user only has to move the bricks down. No 
 horizontal moving anymore and no need to rotate the brick!
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{ONDIO_PAD}{\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
          ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD%
@@ -25,5 +24,4 @@
     \opt{GIGABEAT_S_PAD}{\ButtonBack}
       \opt{HAVEREMOTEKEYMAP}{& }
         & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/midiplay.tex
===================================================================
--- manual/plugins/midiplay.tex	(Revision 25077)
+++ manual/plugins/midiplay.tex	(Arbeitskopie)
@@ -14,8 +14,7 @@
 might experience ``Buffer miss!'' with many files, except simple ones.}
 }
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
         ,IAUDIO_X5_PAD,MROBE100_PAD}{\ButtonUp/ \ButtonDown}
     \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd/ \ButtonScrollBack}
@@ -49,5 +48,4 @@
     \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Stop playback and quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/sudoku.tex
===================================================================
--- manual/plugins/sudoku.tex	(Revision 25077)
+++ manual/plugins/sudoku.tex	(Arbeitskopie)
@@ -27,8 +27,7 @@
 settings.
 \note{The scratchpad is \emph{not} saved when saving the game.}
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
         ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
         ,GIGABEAT_S_PAD,MROBE100_PAD}
@@ -98,8 +97,7 @@
   \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
     %
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 Some places where can you can find \fname{.ss} files:
 \begin{itemize}
Index: manual/plugins/zxbox.tex
===================================================================
--- manual/plugins/zxbox.tex	(Revision 25077)
+++ manual/plugins/zxbox.tex	(Arbeitskopie)
@@ -12,8 +12,7 @@
 or they can be used like a ``Kempston'' joystick. Per default the buttons,
 including an additional but fixed menu button, are assigned as follows:
 
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu/\ButtonPlay/}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
         ,IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,MROBE100_PAD}{\ButtonUp/\ButtonDown/}
@@ -47,8 +46,7 @@
     \opt{IRIVER_H10_PAD}{\ButtonFF}
   \opt{HAVEREMOTEKEYMAP}{& }
     & Open ZXBox menu\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 \subsubsection{ZXBox menu}
 \begin{description}
Index: manual/plugins/demystify.tex
===================================================================
--- manual/plugins/demystify.tex	(Revision 25077)
+++ manual/plugins/demystify.tex	(Arbeitskopie)
@@ -2,8 +2,7 @@
 \subsection{Demystify}
 \screenshot{plugins/images/ss-demystify}{Demystify}{img:demystify}
 Demystify is a screen saver like demo.\\
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD%
@@ -31,5 +30,4 @@
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
Index: manual/plugins/chessbox.tex
===================================================================
--- manual/plugins/chessbox.tex	(Revision 25077)
+++ manual/plugins/chessbox.tex	(Arbeitskopie)
@@ -28,8 +28,7 @@
 }
 
 \subsubsection{Keys}
-\begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay, \ButtonLeft, \ButtonRight}
     \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{Direction keys}
        \opt{HAVEREMOTEKEYMAP}{& }
@@ -76,4 +75,3 @@
        \opt{HAVEREMOTEKEYMAP}{& }
     & Show the menu\\
     \end{btnmap}
-\end{table}
Index: manual/preamble.tex
===================================================================
--- manual/preamble.tex	(Revision 25077)
+++ manual/preamble.tex	(Arbeitskopie)
@@ -353,10 +353,9 @@
 \newcommand{\btnhead}{\textbf{Key} \opt{HAVEREMOTEKEYMAP}{%
   & \textbf{Remote Key}} & \textbf{Action} \\\midrule}
 % environment intended to be used with button maps
-% usage: \begin{btnmap}{caption}{label} Button & ButtonAction \\ \end{btnmap}
+% usage: \begin{btnmap} 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 :)
 
 % tabularx is set to be either two or three columns wide depending on whether
@@ -364,14 +363,12 @@
 % If it is, then every button table has three columns of the form
 % Main Unit Key  &  Remote Key  &  Description \\
 
-\newenvironment{btnmap}[2]{%
+\newenvironment{btnmap}{%
   \rowcolors{2}{tbloddrowbgcolor}{tblevenrowbgcolor}
   \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
Index: manual/rockbox_interface/main.tex
===================================================================
--- manual/rockbox_interface/main.tex	(Revision 25077)
+++ manual/rockbox_interface/main.tex	(Arbeitskopie)
@@ -464,8 +464,7 @@
 \opt{cowond2}{Rockbox has a dual-boot feature with the original firmware being
   the default.\\}
 To turn on and off your Rockbox enabled \dap{} use the following keys:
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}%
       \opt{IPOD_4G_PAD}{\ButtonMenu{} / \ButtonSelect}%
       \opt{IPOD_3G_PAD}{\ButtonMenu{} / \ButtonPlay}%
@@ -491,7 +490,6 @@
           }
       & Shutdown Rockbox.\\
     \end{btnmap}
-  \end{table}
 
 \label{ref:Safeshutdown}On shutdown, Rockbox automatically saves its settings.
 
Index: manual/rockbox_interface/wps.tex
===================================================================
--- manual/rockbox_interface/wps.tex	(Revision 25077)
+++ manual/rockbox_interface/wps.tex	(Arbeitskopie)
@@ -55,8 +55,7 @@
 
 \subsection{\label{ref:WPS_Key_Controls}WPS Key Controls}
 
-\begin{table}
-  \begin{btnmap}{}{}
+  \begin{btnmap}
       \ActionWpsVolUp{} / \ActionWpsVolDown
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsVolUp{} / \ActionRCWpsVolDown}
       & Volume up/down.\\
@@ -163,7 +162,6 @@
           & Switch to the \setting{Recording Screen}.\\
       }%
     \end{btnmap}
-\end{table}
 
 
 \opt{lcd_bitmap}{
@@ -310,8 +308,7 @@
   always be set to 100\%.
 
   \nopt{swcodec}{
-    \begin{table}
-      \begin{btnmap}{}{}
+      \begin{btnmap}
         \ActionPsToggleMode
         & Toggle pitch changing mode. \\
         %
@@ -333,14 +330,12 @@
         & Leave the \setting{Pitch Screen}. \\
         %
       \end{btnmap}
-    \end{table}
 
     \warn{Changing the pitch can cause audible 'Artifacts' or 'Dropouts'.}
   }
 
   \opt{swcodec}{
-    \begin{table}
-      \begin{btnmap}{}{}
+      \begin{btnmap}
         \ActionPsToggleMode
         \opt{HAVEREMOTEKEYMAP}{& \ActionRCPsToggleMode}
         & Toggle pitch changing mode (cycle through all available modes).\\
@@ -368,7 +363,6 @@
         & Leave the \setting{Pitch Screen}. \\
         %
       \end{btnmap}
-    \end{table}
   }
 
 }
@@ -399,13 +393,11 @@
   See \reference{ref:PlaybackOptions} for more information about these
   settings.
 
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \ButtonLeft & Control Shuffle mode setting. \\
       \ButtonRight & Control Repeat mode setting. \\
       \ButtonDown & Control Show file setting. \\
     \end{btnmap}
-  \end{table}
   
   \ButtonFThree\ controls frequently used display options.
   
@@ -421,11 +413,9 @@
   See \reference{ref:Displayoptions} for more information about these
   settings.
   
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \ButtonLeft & Control scroll bar display. \\
       \ButtonRight & Control status bar display. \\
       \ButtonDown & Control upside down screen setting. \\
     \end{btnmap}
-  \end{table}
 }
Index: manual/rockbox_interface/browsing_and_playing.tex
===================================================================
--- manual/rockbox_interface/browsing_and_playing.tex	(Revision 25077)
+++ manual/rockbox_interface/browsing_and_playing.tex	(Arbeitskopie)
@@ -43,8 +43,7 @@
 }}
 
 \subsection{\label{ref:controls}File Browser Controls}
-\begin{table}
-    \begin{btnmap}{}{}
+\begin{btnmap}
       \ActionStdPrev{}/\ActionStdNext{}
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdPrev{}/\ActionRCStdNext{}}
          & Go to previous/next item in list. If you are on the first/last 
@@ -108,8 +107,7 @@
         \ActionStdRec & Switch to the \setting{Recording Screen}.\\
       %
       }
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 \opt{RECORDER_PAD}{
   The functions of the F keys are also summarised on the button bar at the
@@ -207,8 +205,7 @@
 
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
     ,MROBE100_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \ActionKbdLeft{} / \ActionKbdRight{} / \ActionKbdUp{} / \ActionKbdDown
       \opt{HAVEREMOTEKEYMAP}{
       & \ActionRCKbdLeft{} / \ActionRCKbdRight{} / \ActionRCKbdUp{} / \ActionRCKbdDown}
@@ -252,12 +249,10 @@
         %
       }
     \end{btnmap}
-  \end{table}
 }
 \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,IAUDIO_M3_PAD}{
   \textbf{Picker area}
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \ActionKbdLeft{} / \ActionKbdRight
       \opt{HAVEREMOTEKEYMAP}{& }
       & Move the cursor on the virtual keyboard.
@@ -294,11 +289,9 @@
         %
       }
     \end{btnmap}
-  \end{table}
 
   \textbf{Line edit mode}
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \ActionKbdLeft{} / \ActionKbdRight
       \opt{HAVEREMOTEKEYMAP}{& }
       & Move the line cursor within the text line. \\
@@ -312,14 +305,12 @@
       & Return to the picker area. \\
       %
     \end{btnmap}
-  \end{table}
 }
 \opt{player}{
   The current text line to be entered or edited is always listed on the first
   line of the display. The second line of the display can contain the character
   selection bar, as in the screenshot above.
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \ButtonOn & Toggle picker- and line edit mode. \\
       \ButtonLeft{} / \ButtonRight
         & Move back and forth in the selected line (picker of input line). \\
@@ -329,7 +320,6 @@
       \ButtonStop & Cancel \\
       \ButtonMenu & Flip picker lines. \\
     \end{btnmap}
-  \end{table}
 }
 
 \input{rockbox_interface/tagcache.tex}
Index: manual/configure_rockbox/system_options.tex
===================================================================
--- manual/configure_rockbox/system_options.tex	(Revision 25077)
+++ manual/configure_rockbox/system_options.tex	(Arbeitskopie)
@@ -225,8 +225,7 @@
         and skips tracks on the host computer. It is equivalent for the
         multimedia keys found on top of some multimedia keyboards.
 
-        \begin{table}
-            \begin{btnmap}{}{}
+            \begin{btnmap}
                 % Volume up / down
                 \opt{SANSA_E200_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {\ButtonScrollFwd / \ButtonScrollBack}
@@ -310,7 +309,6 @@
                 Scan next track
                 \\
             \end{btnmap}
-        \end{table}
 
         \item [Presentation.] This mode lets you control a presentation program
         (e.g. OpenOffice Impress, and some other popular application), making
@@ -318,8 +316,7 @@
         for lecturers who does not have a wireless remote control for this
         purpose.
 
-        \begin{table}
-            \begin{btnmap}{}{}
+            \begin{btnmap}
                 % Slideshow start
                 \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonUp}
                 \opt{GIGABEAT_S_PAD}{\ButtonPlay; \ButtonUp}
@@ -462,14 +459,12 @@
                 Perform a 'mouse over' over a link
                 \\
             \end{btnmap}
-        \end{table}
 
         \item [Browser.] This mode lets you control a web browser (e.g. 
         Firefox). It uses the \dap{}'s keys to navigate through the web page
         and different tabs, navigate through history, and to control zoom.
 
-        \begin{table}
-            \begin{btnmap}{}{}
+            \begin{btnmap}
                 % Scroll up / down
                 \opt{SANSA_E200_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}
                     {\ButtonScrollBack / \ButtonScrollFwd}
@@ -592,14 +587,12 @@
                 View full-screen toggle
                 \\
             \end{btnmap}
-        \end{table}
 
         {\opt{usb_hid_mouse}{
         \item [Mouse.] This mode emulates a mouse. Features supported: Mouse
         movement; left and right button clicking; and dragging and dropping.
 
-        \begin{table}
-            \begin{btnmap}{}{}
+            \begin{btnmap}
                 % Cursor move up / down / left / right
                 \opt{SANSA_E200_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD%
                     ,SANSA_CLIP_PAD,MROBE100_PAD}
@@ -658,7 +651,6 @@
                 Mouse wheel scroll up / down, respectively
                 \\
             \end{btnmap}
-        \end{table}
     }}
     \end{description}
 }
Index: manual/configure_rockbox/bookmarking.tex
===================================================================
--- manual/configure_rockbox/bookmarking.tex	(Revision 25077)
+++ manual/configure_rockbox/bookmarking.tex	(Arbeitskopie)
@@ -67,8 +67,7 @@
   
   \item [Bookmark list keys.] The following keys can be used to navigate in
   any bookmark list.\\
-\begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \ActionStdNext
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdNext}
       & Selects the next bookmark.\\
@@ -93,7 +92,6 @@
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext}
       & Enters the context menu for the selected bookmark.\\
     \end{btnmap}
-\end{table}
 
 There are two options in the context menu:\\*
   
Index: manual/configure_rockbox/sound_settings.tex
===================================================================
--- manual/configure_rockbox/sound_settings.tex	(Revision 25077)
+++ manual/configure_rockbox/sound_settings.tex	(Arbeitskopie)
@@ -323,8 +323,7 @@
   the three parameters described above (gain, centre frequency, and Q) for each
   of the five EQ bands.
   
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonScrollFwd}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
       \opt{SANSA_E200_PAD}{\ButtonScrollBack}
@@ -383,7 +382,6 @@
         }
       & Exits the graphic EQ screen.\\
     \end{btnmap}
-  \end{table}
 
   \item[Pre-cut.]
   If too much gain is added through the graphical EQ, your music may distort.
Index: manual/main_menu/fmradio.tex
===================================================================
--- manual/main_menu/fmradio.tex	(Revision 25077)
+++ manual/main_menu/fmradio.tex	(Arbeitskopie)
@@ -39,8 +39,7 @@
       MAS-chip is set to record mode for instant recordings.}
   }
 
-    \begin{table}
-      \begin{btnmap}{}{}
+      \begin{btnmap}
           \ActionFMPrev, \ActionFMNext
           \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMPrev, \ActionRCFMNext}
           & Change frequency in \setting{SCAN} mode or jump to next/previous
@@ -91,7 +90,6 @@
           \opt{HAVEREMOTEKEYMAP}{& \ActionRCFMMenu}
           & Display the FM radio settings menu.\\
        \end{btnmap}
-    \end{table}
 
   \begin{description}
 
Index: manual/main_menu/main.tex
===================================================================
--- manual/main_menu/main.tex	(Revision 25077)
+++ manual/main_menu/main.tex	(Arbeitskopie)
@@ -16,8 +16,7 @@
 safely (see \reference{ref:Safeshutdown}).
 
 \section{Navigating the Main Menu}
-\begin{table}
-  \begin{btnmap}{}{}
+  \begin{btnmap}
     \ActionStdNext
     \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdNext}    
     & Select the next option in the menu.\\
@@ -39,7 +38,6 @@
     \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdCancel}
     & Exit menu or setting, or move to parent menu.\\
   \end{btnmap}
-\end{table}
 
 \section {Recent Bookmarks}
 \screenshot{main_menu/images/ss-list-bookmarks}%
@@ -53,8 +51,7 @@
         database. In addition, they do not currently work with dynamic
         playlists.\\*} 
 
-\begin{table}
-  \begin{btnmap}{}{}
+  \begin{btnmap}
     \ActionStdNext
     \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdNext}
     & Select the next bookmark.\\
@@ -79,7 +76,6 @@
     \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext}  
     & Enter the context menu for the selected bookmark.\\
   \end{btnmap}
-\end{table}
 
 There are two options in the context menu:\\*
   
Index: manual/main_menu/recording_screen.tex
===================================================================
--- manual/main_menu/recording_screen.tex	(Revision 25077)
+++ manual/main_menu/recording_screen.tex	(Arbeitskopie)
@@ -27,8 +27,7 @@
 status bar.\\*
 
 The controls for this screen are:
-\begin{table}
-  \begin{btnmap}{}{}
+  \begin{btnmap}
     
     \ActionRecPrev{} / \ActionRecNext 
     \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecPrev{} / \ActionRCRecNext}
@@ -84,4 +83,3 @@
       & While recording: Start a new recording file.\\
     }
   \end{btnmap}
-\end{table}