1 files changed, 14 insertions, 48 deletions

diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index 55d43239bc..987ae3e910 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -9,56 +9,22 @@ 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{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}
-    \opt{IAUDIO_X5_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD}{\ButtonUp}
-    \opt{GIGABEAT_PAD}{\ButtonA}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCOn}
-           }
+    \opt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginSelect}
+    \nopt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginUp}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp}
         & Pause game\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,IRIVER_H10_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,PBELL_VIBE500_PAD}
-        {\ButtonLeft{} / \ButtonRight}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}
-        {\ButtonScrollFwd{} / \ButtonScrollBack}
-    \opt{COWON_D2_PAD}{\ButtonMinus{} / \ButtonPlus{} or \TouchMidLeft{} / \TouchMidRight}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \nopt{scrollwheel}{\PluginLeft{} / \PluginRight}
+    \opt{scrollwheel}{\PluginScrollFwd{} / \PluginScrollBack}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
         & Aim the bubble\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,SANSA_FUZE_PAD}
-        {\ButtonSelect}
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonUp}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{COWON_D2_PAD}{\ButtonMenu{}, \TouchCenter{} or \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \opt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginUp}
+    \nopt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginSelect}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Fire bubble\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft+\ButtonRight}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD}{\ButtonDown}
-    \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
-    \opt{COWON_D2_PAD}{\TouchTopLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
-        & Save game\\
-    \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%
-        ,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-            }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Exit to menu\\
     \end{btnmap}