1 files changed, 12 insertions, 33 deletions

diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index 0a1dbc0968..9ca3fd33bb 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -3,41 +3,20 @@
 \screenshot{plugins/images/ss-fire}{Fire}{img:fire}
 Fire is a demo displaying a fire effect.
 \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}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or \TouchTopMiddle{} / \ButtonMinus{} or \TouchBottomMiddle}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \nopt{scrollwheel}{\PluginUp{} / \PluginDown}
+    \opt{scrollwheel}{\PluginScrollFwd{} / \PluginScrollBack}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & Increase / decrease number of flames\\
-    \opt{RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD%
-        ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
-    \opt{COWON_D2_PAD}{\TouchMidLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginLeft
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft}
     & Toggle flame type\\
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
-        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
-        {\ButtonRight}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-    \opt{COWON_D2_PAD}{\TouchMidRight}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCRight}
     & Toggle moving flames\\
-    \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}
     & Quit\\
 \end{btnmap}