diff --git a/manual/configure_rockbox/bookmarking.tex b/manual/configure_rockbox/bookmarking.tex
index 8f308972ec..a148262485 100644
--- a/manual/configure_rockbox/bookmarking.tex
+++ b/manual/configure_rockbox/bookmarking.tex
@@ -79,8 +79,7 @@
 \end{description}
 
 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.\\
@@ -104,8 +103,7 @@ The following keys can be used to navigate in any bookmark list.
       \ActionStdContext
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext}
       & Enters the context menu for the selected bookmark.\\
-    \end{btnmap}
-\end{table}
+  \end{btnmap}
 
 There are two options in the context menu:
 
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 4828826366..b239efbb1e 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -323,8 +323,7 @@ change to customise your listening experience.
   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,PBELL_VIBE500_PAD}{\ButtonUp}
       \opt{SANSA_E200_PAD}{\ButtonScrollBack}
@@ -385,7 +384,6 @@ change to customise your listening experience.
         }
       & 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.
diff --git a/manual/configure_rockbox/system_options.tex b/manual/configure_rockbox/system_options.tex
index 7488eaa331..a5be25bb27 100644
--- a/manual/configure_rockbox/system_options.tex
+++ b/manual/configure_rockbox/system_options.tex
@@ -251,8 +251,7 @@ therefore result in better runtime.
         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}
@@ -338,7 +337,6 @@ therefore result in better runtime.
                 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
@@ -346,8 +344,7 @@ therefore result in better runtime.
         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}
@@ -498,14 +495,12 @@ therefore result in better runtime.
                 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}
@@ -633,14 +628,12 @@ therefore result in better runtime.
                 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,PBELL_VIBE500_PAD}
@@ -701,7 +694,6 @@ therefore result in better runtime.
                 Mouse wheel scroll up / down, respectively
                 \\
             \end{btnmap}
-        \end{table}
     }}
     \end{description}
 }
diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex
index c14902f833..11b97ade10 100644
--- a/manual/main_menu/fmradio.tex
+++ b/manual/main_menu/fmradio.tex
@@ -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}
 
diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index 8840c683ae..cfe213296a 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -16,8 +16,7 @@ Changes to settings may therefore not be saved unless the \dap{} is shut down
 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 @@ safely (see \reference{ref:Safeshutdown}).
     \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 @@ jump straight to that track.\\*
         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 @@ jump straight to that track.\\*
     \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext}  
     & Enter the context menu for the selected bookmark.\\
   \end{btnmap}
-\end{table}
 
 There are two options in the context menu:\\*
   
diff --git a/manual/main_menu/recording_screen.tex b/manual/main_menu/recording_screen.tex
index 5fa2e5e331..b0e37cc049 100644
--- a/manual/main_menu/recording_screen.tex
+++ b/manual/main_menu/recording_screen.tex
@@ -27,8 +27,7 @@ nothing to worry about. The recording continues during the spin up.\\*}}}
 status bar.\\*
 
 The controls for this screen are:
-\begin{table}
-  \begin{btnmap}{}{}
+  \begin{btnmap}
     
     \ActionRecPrev{} / \ActionRecNext 
     \opt{HAVEREMOTEKEYMAP}{& \ActionRCRecPrev{} / \ActionRCRecNext}
@@ -84,4 +83,3 @@ The controls for this screen are:
       & While recording: Start a new recording file.\\
     }
   \end{btnmap}
-\end{table}
diff --git a/manual/plugins/alarmclock.tex b/manual/plugins/alarmclock.tex
index 51dfeb699c..b7a04458d4 100644
--- a/manual/plugins/alarmclock.tex
+++ b/manual/plugins/alarmclock.tex
@@ -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,PBELL_VIBE500_PAD}
@@ -42,7 +41,6 @@ This plugin is an alarm clock, which resumes a paused song at a given time.
        \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 
diff --git a/manual/plugins/blackjack.tex b/manual/plugins/blackjack.tex
index de0ac90c21..10579a9ddb 100644
--- a/manual/plugins/blackjack.tex
+++ b/manual/plugins/blackjack.tex
@@ -12,8 +12,7 @@ For the full set of rules to the game, and other facinating information
 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,PBELL_VIBE500_PAD}
       {\ButtonLeft{} / \ButtonRight{} / \ButtonUp{} / \ButtonDown}
@@ -65,4 +64,3 @@ visit\\
        \opt{HAVEREMOTEKEYMAP}{& }
         & Pause game and go to menu / Cancel\\
     \end{btnmap}
-\end{table}
diff --git a/manual/plugins/bmpviewer.tex b/manual/plugins/bmpviewer.tex
index 5e36db1979..44fd5e98f8 100755
--- a/manual/plugins/bmpviewer.tex
+++ b/manual/plugins/bmpviewer.tex
@@ -12,8 +12,7 @@ view a bigger file you may need to stop playback.}
 \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,PBELL_VIBE500_PAD}
@@ -101,7 +100,6 @@ view a bigger file you may need to stop playback.}
         & Quit the viewer \\
     }
 \end{btnmap}
-\end{table}
 
 The menu has the following entries.
 \begin{description}
diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index 94b28d3c21..22d6c222bb 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -5,8 +5,7 @@ This demo is of the word ``Rockbox'' bouncing across the screen.
 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,PBELL_VIBE500_PAD}
     {\ButtonUp\ /\ \ButtonDown}
@@ -44,7 +43,6 @@ scrolling from right to left.
        \opt{HAVEREMOTEKEYMAP}{& }
 & Exits bounce demo\\
 \end{btnmap}
-\end{table}
 
 Available options are:
 
diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index 56e4c78c3b..4ed1e32780 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -21,8 +21,7 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
     \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}
@@ -57,4 +56,3 @@ effect, you must catch it with the paddle. Look out for the bad ones.\\
           }
     & Open menu / Quit\\
     \end{btnmap}
-\end{table}
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index 7a5639887c..55d43239bc 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -8,8 +8,7 @@ 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}
-    \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,PBELL_VIBE500_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -63,4 +62,3 @@ fired. Points are awarded depending on how quickly the level was completed.
             }
         & Exit to menu\\
     \end{btnmap}
-\end{table}
diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index 0bfe6914b2..f466bd0494 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -6,8 +6,7 @@ This is a simple scientific calculator for use on the \dap. It works like a
 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,PBELL_VIBE500_PAD}
@@ -81,4 +80,3 @@ standard calculator. Pressing the ``1st'' and ``2nd'' buttons will toggle betwee
        }
     & Quit\\
 \end{btnmap}
-\end{table}
diff --git a/manual/plugins/calendar.tex b/manual/plugins/calendar.tex
index a8402bd430..6d2d6a235c 100644
--- a/manual/plugins/calendar.tex
+++ b/manual/plugins/calendar.tex
@@ -7,8 +7,7 @@ yearly, monthly, and weekly memos.
 
 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,PBELL_VIBE500_PAD}
@@ -57,4 +56,3 @@ You can select what day is first day of week by the setting \setting{First Day o
        \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
 \end{btnmap}
-\end{table}
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index b9126b7378..1ee3cb14b9 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -5,8 +5,7 @@ The chess clock plugin is designed  to simulate a chess clock, but it can be
 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}
@@ -36,7 +35,6 @@ used in any kind of game with up to ten players.
        \opt{HAVEREMOTEKEYMAP}{& }
       & Move to previous screen\\
   \end{btnmap}
-\end{table}
 
 \begin{itemize}
   \item First enter the number of players (1--10)
@@ -54,8 +52,7 @@ time left if different).
 
 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}
@@ -123,7 +120,6 @@ Keys are as follows:
             {(\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
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index 74265fc999..9d963d4c0f 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -28,8 +28,7 @@ the game.
 }
 
 \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}{& }
@@ -78,4 +77,3 @@ the game.
        \opt{HAVEREMOTEKEYMAP}{& }
     & Show the menu\\
     \end{btnmap}
-\end{table}
diff --git a/manual/plugins/chopper.tex b/manual/plugins/chopper.tex
index b415707e0a..f7d7f8a743 100644
--- a/manual/plugins/chopper.tex
+++ b/manual/plugins/chopper.tex
@@ -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}
@@ -30,4 +29,3 @@
        \opt{HAVEREMOTEKEYMAP}{& }
       & Enter menu\\
     \end{btnmap}
-\end{table}
diff --git a/manual/plugins/clix.tex b/manual/plugins/clix.tex
index 1cfb735a46..ee6cdcdcf4 100644
--- a/manual/plugins/clix.tex
+++ b/manual/plugins/clix.tex
@@ -5,8 +5,7 @@ The aim is to remove all blocks from the board. You can only
 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%
@@ -40,4 +39,3 @@ The more blocks you remove per turn, the more points you get.
        \opt{HAVEREMOTEKEYMAP}{& }
      & Exit \\
   \end{btnmap}
-\end{table}
diff --git a/manual/plugins/clock.tex b/manual/plugins/clock.tex
index 1ccc3f0e79..076b0defd7 100644
--- a/manual/plugins/clock.tex
+++ b/manual/plugins/clock.tex
@@ -5,8 +5,7 @@ This is a fully featured analogue and digital clock plugin.
 
 \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,PBELL_VIBE500_PAD}
@@ -63,7 +62,6 @@ This is a fully featured analogue and digital clock plugin.
        \opt{HAVEREMOTEKEYMAP}{& }
     & Save Settings (if enabled) and Exit \\
 \end{btnmap}
-\end{table}
 
 \textbf{Clock Menu}
 \begin{description}
diff --git a/manual/plugins/codebuster.tex b/manual/plugins/codebuster.tex
index 635c668c69..aef8d8e844 100644
--- a/manual/plugins/codebuster.tex
+++ b/manual/plugins/codebuster.tex
@@ -9,8 +9,7 @@ results are displayed in the form of red and white pegs.  A red peg signifies
 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}
@@ -40,4 +39,3 @@ peg in the wrong position.
       \opt{HAVEREMOTEKEYMAP}{& }
         & Change current peg \\
   \end{btnmap}
-\end{table}
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index c8e6a1ff10..6c5aba5623 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -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%
@@ -64,5 +63,4 @@ This is a rotating cube screen saver in 3D.
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
         & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index 6a20c470c8..b2379ad694 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -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%
@@ -33,5 +32,4 @@ Demystify is a screen saver like demo.\\
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/dice.tex b/manual/plugins/dice.tex
index d3a2412d88..e06f837d86 100644
--- a/manual/plugins/dice.tex
+++ b/manual/plugins/dice.tex
@@ -3,8 +3,7 @@ Dice is a simple dice rolling simulator. Select number and type of dice to roll
 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}
@@ -29,5 +28,4 @@ numbers as well as the total of the rolled dice.
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
         & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/disktidy.tex b/manual/plugins/disktidy.tex
index 4b5abd81c5..c1c58271ea 100644
--- a/manual/plugins/disktidy.tex
+++ b/manual/plugins/disktidy.tex
@@ -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}
diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex
index d96c89de49..0535a8d76a 100644
--- a/manual/plugins/doom.tex
+++ b/manual/plugins/doom.tex
@@ -77,8 +77,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin
 \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}
@@ -165,7 +164,6 @@ Rockdoom options, you will need to quit your current game and restart the plugin
     & Change Weapon \\
 %
 \end{btnmap}
-\end{table}
 
 \subsubsection{Playing the game}
 After installation of the \fname{wad} files is complete you can start the
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index b12918cb29..0a1dbc0968 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -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,PBELL_VIBE500_PAD}
         {\ButtonUp\ / \ButtonDown}
@@ -41,5 +40,4 @@ Fire is a demo displaying a fire effect.
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index cc7ab31168..aa0c6ab437 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -5,8 +5,7 @@ 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}
-\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%
@@ -83,4 +82,3 @@ a screen containing tokens of only one colour.
         }
     & Quit the game \\
 \end{btnmap}
-\end{table}
diff --git a/manual/plugins/fractals.tex b/manual/plugins/fractals.tex
index cb7f599dbc..2ca1ed00e8 100644
--- a/manual/plugins/fractals.tex
+++ b/manual/plugins/fractals.tex
@@ -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\\
@@ -82,5 +81,4 @@ This demonstration draws fractal images from the Mandelbrot set%
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
     & Quit\\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/frotz.tex b/manual/plugins/frotz.tex
index da817d0624..33c3c3749d 100644
--- a/manual/plugins/frotz.tex
+++ b/manual/plugins/frotz.tex
@@ -33,8 +33,7 @@ classic commercial Infocom games:
 \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,PBELL_VIBE500_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
@@ -68,5 +67,4 @@ classic commercial Infocom games:
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
             }
         & Open Frotz menu (not available at MORE prompts)\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/goban.tex b/manual/plugins/goban.tex
index 4eee18ebab..18346f91fe 100644
--- a/manual/plugins/goban.tex
+++ b/manual/plugins/goban.tex
@@ -53,8 +53,7 @@ these markers:
 \end{table}
 
 \subsubsection{Controls}
-\begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
         \nopt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,COWON_D2_PAD}
              {\ButtonUp}%
         \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}%
@@ -200,7 +199,6 @@ these markers:
             \\
         }
     \end{btnmap}
-\end{table}
 
 \subsubsection{Menus}
 \begin {description}
diff --git a/manual/plugins/invadrox.tex b/manual/plugins/invadrox.tex
index bfa703a94c..298d6f20bf 100644
--- a/manual/plugins/invadrox.tex
+++ b/manual/plugins/invadrox.tex
@@ -5,8 +5,7 @@ Invadrox is a clone of the classic arcade game Space Invaders.
 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,PBELL_VIBE500_PAD}
@@ -41,5 +40,4 @@ increase speed, drop down and reverse direction after every pass!
     \opt{PBELL_VIBE500_PAD}{\ButtonRec}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/jackpot.tex b/manual/plugins/jackpot.tex
index a76703e6d8..05869afe9e 100644
--- a/manual/plugins/jackpot.tex
+++ b/manual/plugins/jackpot.tex
@@ -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,%
@@ -36,4 +35,3 @@ have 20\$.  Payouts are given when three matching symbols come up.
         }
     & Exit the game \\
 \end{btnmap}
-\end{table}
diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex
index bb66e5f3db..7ffbab7746 100644
--- a/manual/plugins/jewels.tex
+++ b/manual/plugins/jewels.tex
@@ -12,8 +12,7 @@ after every one hundred points and randomly clears several jewels.
 
 In puzzle mode 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,PBELL_VIBE500_PAD}
@@ -48,5 +47,4 @@ In puzzle mode the aim of the game is to connect the puzzles, by skilful swappin
     \opt{PBELL_VIBE500_PAD}{\ButtonRec}
        \opt{HAVEREMOTEKEYMAP}{& }
      & Menu \\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index 57d50f9c81..82e3881427 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -12,8 +12,7 @@ view a bigger file you may need to stop playback.}
 \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,PBELL_VIBE500_PAD}
@@ -101,7 +100,6 @@ view a bigger file you may need to stop playback.}
         & Quit the viewer \\
     }
 \end{btnmap}
-\end{table}
 
 The menu has the following entries.
 \begin{description}
diff --git a/manual/plugins/lamp.tex b/manual/plugins/lamp.tex
index 7fd875671e..af2faa5578 100644
--- a/manual/plugins/lamp.tex
+++ b/manual/plugins/lamp.tex
@@ -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%
@@ -24,5 +23,4 @@ You get an empty screen with maximum brightness.
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
         & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/logo.tex b/manual/plugins/logo.tex
index 73adf3976c..f2b1d52e78 100644
--- a/manual/plugins/logo.tex
+++ b/manual/plugins/logo.tex
@@ -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%
@@ -33,5 +32,4 @@ Demo showing the Rockbox logo bouncing around the screen.
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/mazezam.tex b/manual/plugins/mazezam.tex
index f40d179ffd..32b23db851 100644
--- a/manual/plugins/mazezam.tex
+++ b/manual/plugins/mazezam.tex
@@ -12,8 +12,7 @@ but this will cost you a life.
 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%
@@ -41,4 +40,3 @@ Luckily, there are checkpoints at levels four and eight.
         }
     & Menu\\
 \end{btnmap}
-\end{table}
diff --git a/manual/plugins/metronome.tex b/manual/plugins/metronome.tex
index 440c25bdd7..a1d8febca8 100644
--- a/manual/plugins/metronome.tex
+++ b/manual/plugins/metronome.tex
@@ -3,8 +3,7 @@ This plugin can be used as a metronome to keep time during music
 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}
@@ -49,5 +48,4 @@ on the appropriate button.
     \opt{COWON_D2_PAD}{\ButtonPlus{} / \ButtonMinus{} or \TouchTopMiddle{} / \TouchBottomMiddle}
        \opt{HAVEREMOTEKEYMAP}{& }
         & Adjust volume \\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/midiplay.tex b/manual/plugins/midiplay.tex
index f103ca6bd6..e86f560e9d 100644
--- a/manual/plugins/midiplay.tex
+++ b/manual/plugins/midiplay.tex
@@ -14,8 +14,7 @@ in the file browser to start playback.
 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,PBELL_VIBE500_PAD}{\ButtonUp/ \ButtonDown}
     \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd/ \ButtonScrollBack}
@@ -51,5 +50,4 @@ might experience ``Buffer miss!'' with many files, except simple ones.}
     \opt{PBELL_VIBE500_PAD}{\ButtonRec}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Stop playback and quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index 988edebffe..d03b062466 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -10,8 +10,7 @@ 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}
- \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%
@@ -79,4 +78,3 @@ the location of a mine, it can be tagged to avoid accidentally
         }
   & Exit the game \\
 \end{btnmap}
-\end{table}
diff --git a/manual/plugins/mpegplayer.tex b/manual/plugins/mpegplayer.tex
index 63fc293371..16a498ab65 100644
--- a/manual/plugins/mpegplayer.tex
+++ b/manual/plugins/mpegplayer.tex
@@ -8,8 +8,7 @@ If your file does not have the \fname{.mpg} extension but is encoded in the
 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}
@@ -36,7 +35,6 @@ option and choose \setting{mpegplayer}.
        \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 
diff --git a/manual/plugins/nim.tex b/manual/plugins/nim.tex
index 439bfa9118..10dbb08871 100644
--- a/manual/plugins/nim.tex
+++ b/manual/plugins/nim.tex
@@ -6,12 +6,9 @@ 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
 \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}
-
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index d30b2645c1..336716aced 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -11,8 +11,7 @@ being played.
 
 \subsubsection{Keys}
 
-\begin{table}
-  \begin{btnmap}{}{}
+\begin{btnmap}
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD%
@@ -88,5 +87,4 @@ being played.
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
     & Exit demo \\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index 5ba7680f14..afb4387679 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -26,8 +26,7 @@ These need to be stored in the \fname{/.rockbox/pacman/} directory on your
 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,PBELL_VIBE500_PAD}{\ButtonUp}
@@ -90,6 +89,4 @@ found at \url{http://www.mame.net}.
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Menu\\
-  \end{btnmap}
-\end{table}
-
+\end{btnmap}
diff --git a/manual/plugins/pegbox.tex b/manual/plugins/pegbox.tex
index a309ebbb64..22d8cd9f37 100644
--- a/manual/plugins/pegbox.tex
+++ b/manual/plugins/pegbox.tex
@@ -5,8 +5,7 @@ To beat each level, you must destroy all of the pegs. If two like pegs are
 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,PBELL_VIBE500_PAD}{\ButtonUp, \ButtonDown, } 
@@ -121,6 +120,4 @@ block and crosses which allow you to choose a replacement block.
       \opt{HAVEREMOTEKEYMAP}{& }
         & to quit\\
 
-    \end{btnmap}
-\end{table}
-
+\end{btnmap}
diff --git a/manual/plugins/pictureflow.tex b/manual/plugins/pictureflow.tex
index bbcf786fa9..4819cc31c1 100644
--- a/manual/plugins/pictureflow.tex
+++ b/manual/plugins/pictureflow.tex
@@ -23,8 +23,7 @@ aware:
   \end{itemize}
 
 \subsubsection{Keys}
-\begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
         \opt{scrollwheel,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{
             \ActionStdPrev{} / \ActionStdNext
                 &
@@ -116,7 +115,6 @@ aware:
             \\
             
     \end{btnmap}
-\end{table}
 
 \subsubsection{Main Menu}
 \begin{description}
diff --git a/manual/plugins/plasma.tex b/manual/plugins/plasma.tex
index f08ab7b228..7862d06ba7 100644
--- a/manual/plugins/plasma.tex
+++ b/manual/plugins/plasma.tex
@@ -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}
@@ -34,5 +33,4 @@ Plasma is a demo displaying a 80's style retro plasma effect.
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/pngviewer.tex b/manual/plugins/pngviewer.tex
index 647d35a596..3dfb6d047a 100644
--- a/manual/plugins/pngviewer.tex
+++ b/manual/plugins/pngviewer.tex
@@ -11,8 +11,7 @@ display them.
 \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,PBELL_VIBE500_PAD}
@@ -99,7 +98,6 @@ display them.
         & Quit the viewer \\
     }
 \end{btnmap}
-\end{table}
 
 The menu has the following entries.
 \begin{description}
diff --git a/manual/plugins/pong.tex b/manual/plugins/pong.tex
index 80bc29fa25..1e4d9b840b 100644
--- a/manual/plugins/pong.tex
+++ b/manual/plugins/pong.tex
@@ -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%
@@ -55,5 +54,4 @@ Pong is a simple two player ``tennis game''. Whenever a player misses the ball t
     \opt{PBELL_VIBE500_PAD}{\ButtonRec}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/random_folder_advance_config.tex b/manual/plugins/random_folder_advance_config.tex
index e71acf026f..07f392bc28 100644
--- a/manual/plugins/random_folder_advance_config.tex
+++ b/manual/plugins/random_folder_advance_config.tex
@@ -26,8 +26,7 @@ it you need to have both \fname{-/CDs} and \fname{CDs} as entries.
 \end{description}
 
 \subsubsection{Folder List Editor Keys}
-\begin{table}
-\begin{btnmap}{}{}
+\begin{btnmap}
     \ActionStdOk{} 
         \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdOk} 
      & Delete selected folder\\
@@ -42,4 +41,3 @@ it you need to have both \fname{-/CDs} and \fname{CDs} as entries.
     & Exit\\
 
 \end{btnmap}
-\end{table}
diff --git a/manual/plugins/robotfindskitten.tex b/manual/plugins/robotfindskitten.tex
index 6ffa636e44..2ee2b5ecf1 100644
--- a/manual/plugins/robotfindskitten.tex
+++ b/manual/plugins/robotfindskitten.tex
@@ -6,8 +6,7 @@ is complicated by the existence of various things which are not kitten.
 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%
@@ -36,4 +35,3 @@ ends when robotfindskitten.
        }
     & Quit\\
 \end{btnmap}
-\end{table}
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index 28429976a3..d826b95cd1 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -7,8 +7,7 @@ form full rows. Whenever a row is completed,  it will be cleared away, and you
 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}
@@ -103,5 +102,4 @@ the blocks fall faster. If the pile of blocks reaches the ceiling, the game is o
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
         & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/rockblox1d.tex b/manual/plugins/rockblox1d.tex
index 7a2216cb97..6f421f41b6 100644
--- a/manual/plugins/rockblox1d.tex
+++ b/manual/plugins/rockblox1d.tex
@@ -5,8 +5,7 @@ Rockblox1d is a game for people who find rockblox too hard. In this version the
 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%
@@ -27,5 +26,4 @@ horizontal moving anymore and no need to rotate the brick!
     \opt{PBELL_VIBE500_PAD}{\ButtonRec}
       \opt{HAVEREMOTEKEYMAP}{& }
         & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index 4b74619918..4231198ec6 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -10,8 +10,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
 }
 
 \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}
@@ -91,8 +90,7 @@ the gnuboy emulator. To start a game, open a ROM file saved as \fname{.gb} or
     \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
        \opt{HAVEREMOTEKEYMAP}{& }
     & Open Rockboy menu\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 \subsubsection{Rockboy menu}
 \begin{description}
diff --git a/manual/plugins/rockpaint.tex b/manual/plugins/rockpaint.tex
index dd2316114f..aaae143cf9 100644
--- a/manual/plugins/rockpaint.tex
+++ b/manual/plugins/rockpaint.tex
@@ -103,8 +103,7 @@ The main menu consists of the following:
 \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,PBELL_VIBE500_PAD}
             {\ButtonPower}
@@ -154,5 +153,4 @@ if you select Exit, so any unsaved changes will be lost.}
       \opt{HAVEREMOTEKEYMAP}{& }
     & Toggles the brush and selects objects.\\
 
-  \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index 7bf3983132..ea06bf2373 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -11,8 +11,7 @@ to turn your own pictures into a puzzle.
 
 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,PBELL_VIBE500_PAD}
@@ -64,5 +63,4 @@ launched via Open With), and numbered tiles \\
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
   & Stop the game \\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/snake.tex b/manual/plugins/snake.tex
index ca8adc0fdc..c1ea590b61 100644
--- a/manual/plugins/snake.tex
+++ b/manual/plugins/snake.tex
@@ -5,8 +5,7 @@ This is the popular snake game. The aim is to grow your snake as large
 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,PBELL_VIBE500_PAD}
@@ -27,5 +26,4 @@ end when the snake touches either the borders of the screen or itself.
        \opt{HAVEREMOTEKEYMAP}{& }
      & Toggle Play/Pause\\
     %
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/snake2.tex b/manual/plugins/snake2.tex
index 2d4c17b3bd..51e9053b28 100644
--- a/manual/plugins/snake2.tex
+++ b/manual/plugins/snake2.tex
@@ -7,8 +7,7 @@ apples that pop up on the screen. Each time an apple is eaten, the
 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%
@@ -76,8 +75,7 @@ into itself.
     \opt{PBELL_VIBE500_PAD}{\ButtonRec}
   \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
diff --git a/manual/plugins/sokoban.tex b/manual/plugins/sokoban.tex
index 15d7eaf15d..4af132a49b 100644
--- a/manual/plugins/sokoban.tex
+++ b/manual/plugins/sokoban.tex
@@ -11,8 +11,7 @@ the standard Sokoban text format or RLE (Run Length Encoded). For more
 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%
@@ -143,7 +142,6 @@ information about the level format, see
        \opt{HAVEREMOTEKEYMAP}{& }
     & Quit \\
 \end{btnmap}
-\end{table}
 
 Some places where can you can find level sets:
 \begin{itemize}
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index d7738476a7..84636645c9 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -13,8 +13,7 @@ For the full set of rules to the game, and other interesting information
 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,PBELL_VIBE500_PAD}
       {\ButtonUp{} / \ButtonDown}
@@ -112,5 +111,4 @@ visit
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
         }
       & Show menu\\
-   \end{btnmap}
-  \end{table}
+\end{btnmap}
diff --git a/manual/plugins/spacerocks.tex b/manual/plugins/spacerocks.tex
index 7d51b1fa6e..54818f837b 100644
--- a/manual/plugins/spacerocks.tex
+++ b/manual/plugins/spacerocks.tex
@@ -4,8 +4,7 @@ Spacerocks is a clone of the old arcade game Asteroids.  The goal of the game
 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}
@@ -71,5 +70,4 @@ UFO will appear -- shoot this for extra points.
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/split_editor.tex b/manual/plugins/split_editor.tex
index dad5ca0d70..d571286006 100644
--- a/manual/plugins/split_editor.tex
+++ b/manual/plugins/split_editor.tex
@@ -113,7 +113,7 @@ The whole process of splitting an mp3 file consists of three steps:
   \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 @@ The whole process of splitting an mp3 file consists of three steps:
       & Play normal speed \\
     }
     \end{btnmap}
+	\caption{Controls in the split editor}
   \end{table}
 
 \subsubsection{Save dialogue}
@@ -163,7 +164,7 @@ filename
 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 @@ Save Dialogue}{}
     %
     \ButtonOff & Cancel \\
   \end{btnmap}
+  \caption{Controls in the save dialogue}
 \end{table}
 
 \subsubsection{\label{ref:Scalemode}Scale}
diff --git a/manual/plugins/star.tex b/manual/plugins/star.tex
index d211a855a0..962513ead0 100644
--- a/manual/plugins/star.tex
+++ b/manual/plugins/star.tex
@@ -10,8 +10,7 @@ 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}
-  \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%
@@ -103,5 +102,4 @@ could not otherwise reach. The block cannot take ``o''s.
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
        }
         & Exit the game \\
-  \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/starfield.tex b/manual/plugins/starfield.tex
index d79fcf8c6f..5108d5ef27 100644
--- a/manual/plugins/starfield.tex
+++ b/manual/plugins/starfield.tex
@@ -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%
@@ -42,5 +41,4 @@ Starfield simulation (like the classic screensaver).
           \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
   }
     & Quit\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index af25743360..c9c0f5c8d7 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -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}
@@ -55,5 +54,4 @@ A simple stopwatch program with support for saving times.
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
   \opt{HAVEREMOTEKEYMAP}{& }
     & Scroll through lap times \\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index a79f412927..bbe44ab8d4 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -27,8 +27,7 @@ can be displayed inline as small dots by enabling the \setting{Show Markings}
 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,PBELL_VIBE500_PAD}
@@ -101,8 +100,7 @@ settings.
   \opt{HAVEREMOTEKEYMAP}{& }
     & Quit\\
     %
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 Some places where can you can find \fname{.ss} files:
 \begin{itemize}
diff --git a/manual/plugins/text_editor.tex b/manual/plugins/text_editor.tex
index f245cb4eda..18d1d91982 100644
--- a/manual/plugins/text_editor.tex
+++ b/manual/plugins/text_editor.tex
@@ -18,8 +18,7 @@ the \setting{Virtual Keyboard} (see \reference{sec:virtual_keyboard}).
 \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 @@ the \setting{Virtual Keyboard} (see \reference{sec:virtual_keyboard}).
     \ActionStdContext 
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCStdContext} 
     & Delete Line\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 487f8eba7a..e56734fe34 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -8,8 +8,7 @@ by using \emph{Open with} from the \emph{Context Menu}
 (see \reference{ref:Contextmenu}). You can also bookmark pages.
 
 \subsubsection{Default keys}
-\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}
@@ -152,8 +151,7 @@ by using \emph{Open with} from the \emph{Context Menu}
     }
         & Exit text viewer\\
 
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 \subsubsection{Menu}
 
diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex
index 23c785ebfd..a29d88f44b 100644
--- a/manual/plugins/vumeter.tex
+++ b/manual/plugins/vumeter.tex
@@ -9,8 +9,7 @@ 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}
-\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%
@@ -60,4 +59,3 @@ and the meter scale can be changed.
   \opt{HAVEREMOTEKEYMAP}{& }
     & Lower Volume\\
 \end{btnmap}
-\end{table}
diff --git a/manual/plugins/wormlet.tex b/manual/plugins/wormlet.tex
index 1f170d9196..0a49aacc60 100644
--- a/manual/plugins/wormlet.tex
+++ b/manual/plugins/wormlet.tex
@@ -53,8 +53,7 @@ Game controls:}
 }
 
 \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%
@@ -88,7 +87,6 @@ Game controls:}
            \opt{HAVEREMOTEKEYMAP}{& }
         & Turn Down\\
     \end{btnmap}
-\end{table}
 }
 
 \subsubsection{The game}
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index ffd31b67de..9ddf179858 100644
--- a/manual/plugins/xobox.tex
+++ b/manual/plugins/xobox.tex
@@ -7,8 +7,7 @@ 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}
-\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,PBELL_VIBE500_PAD}%
@@ -42,4 +41,3 @@ To finish a level you have to section off more than 75\%.
   \opt{HAVEREMOTEKEYMAP}{& }
     & Open menu\\
 \end{btnmap}
-\end{table}
diff --git a/manual/plugins/zxbox.tex b/manual/plugins/zxbox.tex
index 7ec729ab74..f5ab4bc96d 100644
--- a/manual/plugins/zxbox.tex
+++ b/manual/plugins/zxbox.tex
@@ -12,8 +12,7 @@ Jump/Fire. Each one of these can be mapped to one key of the Spectrum Keyboard
 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,PBELL_VIBE500_PAD}%
@@ -50,8 +49,7 @@ including an additional but fixed menu button, are assigned as follows:
     \opt{PBELL_VIBE500_PAD}{\ButtonCancel}
   \opt{HAVEREMOTEKEYMAP}{& }
     & Open ZXBox menu\\
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 \subsubsection{ZXBox menu}
 \begin{description}
diff --git a/manual/preamble.tex b/manual/preamble.tex
index 3eef5eb3b8..9223fee406 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -354,10 +354,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
@@ -365,17 +364,15 @@
 % 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%
+    \endcenter\vspace{2ex}%
   }
-  \center
+  \vspace{2ex}\center
   \opt{HAVEREMOTEKEYMAP}{
     % here is the table width defined for 3 columns
     \tabularx{.95\textwidth}{>{\raggedright\arraybackslash}p{.2\textwidth}>{\raggedright\arraybackslash}p{.2\textwidth}X}\toprule\rowcolor{tblhdrbgcolor}
diff --git a/manual/rockbox_interface/browsing_and_playing.tex b/manual/rockbox_interface/browsing_and_playing.tex
index c087036a6b..8d7972b237 100644
--- a/manual/rockbox_interface/browsing_and_playing.tex
+++ b/manual/rockbox_interface/browsing_and_playing.tex
@@ -43,8 +43,7 @@ the \setting{Show Files} setting to all.
 }}
 
 \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 
@@ -117,8 +116,7 @@ the \setting{Show Files} setting to all.
         (see \reference{ref:Hotkeys}).
             \\
       }
-    \end{btnmap}
-\end{table}
+\end{btnmap}
 
 \opt{RECORDER_PAD}{
   The functions of the F keys are also summarised on the button bar at the
@@ -216,8 +214,7 @@ example when renaming a file or creating a new directory.
 
 \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}
@@ -261,13 +258,11 @@ example when renaming a file or creating a new directory.
         %
       }
     \end{btnmap}
-  \end{table}
 }
 \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,IAUDIO_M3_PAD
      ,PBELL_VIBE500_PAD}{
   \textbf{Picker area}
-  \begin{table}
-    \begin{btnmap}{}{}
+    \begin{btnmap}
       \ActionKbdLeft{} / \ActionKbdRight
       \opt{HAVEREMOTEKEYMAP}{& }
       & Move the cursor on the virtual keyboard.
@@ -309,11 +304,9 @@ example when renaming a file or creating a new directory.
         %
       }
     \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. \\
@@ -327,14 +320,12 @@ example when renaming a file or creating a new directory.
       & 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). \\
@@ -344,7 +335,6 @@ example when renaming a file or creating a new directory.
       \ButtonStop & Cancel \\
       \ButtonMenu & Flip picker lines. \\
     \end{btnmap}
-  \end{table}
 }
 
 \input{rockbox_interface/tagcache.tex}
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index d51f63fca0..e66ba0c926 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -484,8 +484,7 @@ detail in the following paragraph.
 \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}%
@@ -512,7 +511,6 @@ To turn on and off your Rockbox enabled \dap{} use the following keys:
           }
       & Shutdown Rockbox.\\
     \end{btnmap}
-  \end{table}
 
 \label{ref:Safeshutdown}On shutdown, Rockbox automatically saves its settings.
 
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 8f750b8461..579caddfa8 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -55,8 +55,7 @@ your WPS (While Playing Screen).
 
 \subsection{\label{ref:WPS_Key_Controls}WPS Key Controls}
 
-\begin{table}
-  \begin{btnmap}{}{}
+  \begin{btnmap}
       \ActionWpsVolUp{} / \ActionWpsVolDown
       \opt{HAVEREMOTEKEYMAP}{& \ActionRCWpsVolUp{} / \ActionRCWpsVolDown}
       & Volume up/down.\\
@@ -170,8 +169,7 @@ your WPS (While Playing Screen).
           \opt{HAVEREMOTEKEYMAP}{&} 
           & Switch to the \setting{Recording Screen}.\\
       }%
-    \end{btnmap}
-\end{table}
+  \end{btnmap}
 
 
 \opt{lcd_bitmap}{
@@ -321,8 +319,7 @@ This may even be the whole track.
   playing back those bookmarks.}
 
   \nopt{swcodec}{
-    \begin{table}
-      \begin{btnmap}{}{}
+      \begin{btnmap}
         \ActionPsToggleMode
         & Toggle pitch changing mode. \\
         %
@@ -344,14 +341,12 @@ This may even be the whole track.
         & 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).\\
@@ -381,7 +376,6 @@ This may even be the whole track.
         & Leave the \setting{Pitch Screen}. \\
         %
       \end{btnmap}
-    \end{table}
   }
 
 }
@@ -412,13 +406,11 @@ This may even be the whole track.
   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}
+  \end{btnmap}
   
   \ButtonFThree\ controls frequently used display options.
   
@@ -434,11 +426,9 @@ This may even be the whole track.
   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}
+  \end{btnmap}
 }