34 files changed, 84 insertions, 87 deletions

diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index dd5d0a2a47..ff6b82a7ad 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -343,12 +343,12 @@ change to customise your listening experience.
     \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}{\ButtonScrollUp}
+      \opt{SANSA_E200_PAD}{\ButtonScrollBack}
       & Raises the highlighted parameter.\\
       %
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonScrollBack}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown} 
-      \opt{SANSA_E200_PAD}{\ButtonScrollDown}
+      \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
       & Lowers the highlighted parameter.\\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonLeft}
diff --git a/manual/main_menu/fmradio.tex b/manual/main_menu/fmradio.tex
index 2a9f432031..f2a02b5c86 100644
--- a/manual/main_menu/fmradio.tex
+++ b/manual/main_menu/fmradio.tex
@@ -31,7 +31,8 @@
           & Seek to next station or preset in
             \setting{SCAN} mode.\\
           %
-          \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp, \ButtonScrollDown}
+          \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown}
+          \opt{SANSA_E200_PAD}{\ButtonScrollBack, \ButtonScrollFwd}
           \opt{SANSA_C200_PAD}{\ButtonVolUp, \ButtonVolDown}
           \nopt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonUp, \ButtonDown}
             & Change volume.\\
@@ -116,7 +117,8 @@
         \opt{IRIVER_H10_PAD}{Press \ButtonRight}
         to go to the presets list.
         Use
-        \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp, \ButtonScrollDown}%
+        \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown}
+        \opt{IRIVER_H10_PAD}{\ButtonScrollBack, \ButtonScrollFwd}%
         \nopt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonUp\ and \ButtonDown}
         to move the cursor and then press
         \opt{RECORDER_PAD}{\ButtonPlay}%
@@ -133,7 +135,8 @@
             {Press \ButtonSelect}%
         \opt{IRIVER_H10_PAD}{Press \ButtonRight}
         to go to the presets list. Use
-        \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp, \ButtonScrollDown}%
+        \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown}
+        \opt{SANSA_E200_PAD}{\ButtonScrollBack, \ButtonScrollFwd}%
         \nopt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonUp\ and \ButtonDown}
         to move the cursor and then
         \opt{RECORDER_PAD}{press \ButtonFThree}%
diff --git a/manual/platform/e200.tex b/manual/platform/e200.tex
index 664794376e..db3bbf6685 100644
--- a/manual/platform/e200.tex
+++ b/manual/platform/e200.tex
@@ -37,15 +37,15 @@
 \newcommand{\ButtonDown}{\btnfnt{Submenu}}
 \newcommand{\ButtonSelect}{\btnfnt{Select}}
 \newcommand{\ButtonPower}{\btnfnt{Power}}
-\newcommand{\ButtonScrollUp}{\btnfnt{Scroll Up}}
-\newcommand{\ButtonScrollDown}{\btnfnt{Scroll Down}}
+\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Backward}}
+\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Forward}}
 \newcommand{\ButtonHold}{\btnfnt{Hold}}
 
 %Button actions, standard context
-\newcommand{\ActionStdPrev}{\ButtonScrollUp}
-\newcommand{\ActionStdPrevRepeat}{Long \ButtonScrollUp}
-\newcommand{\ActionStdNext}{\ButtonScrollDown}
-\newcommand{\ActionStdNextRepeat}{Long \ButtonScrollDown}
+\newcommand{\ActionStdPrev}{\ButtonScrollBack}
+\newcommand{\ActionStdPrevRepeat}{Long \ButtonScrollBack}
+\newcommand{\ActionStdNext}{\ButtonScrollFwd}
+\newcommand{\ActionStdNextRepeat}{Long \ButtonScrollFwd}
 \newcommand{\ActionStdCancel}{\ButtonLeft}
 \newcommand{\ActionStdContext}{Long \ButtonSelect}
 \newcommand{\ActionStdQuickScreen}{Long \ButtonDown}
@@ -61,8 +61,8 @@
 \newcommand{\ActionWpsSeekFwd}{Long \ButtonRight}
 
 \newcommand{\ActionWpsStop}{\ButtonPower}
-\newcommand{\ActionWpsVolDown}{\ButtonScrollDown}
-\newcommand{\ActionWpsVolUp}{\ButtonScrollUp}
+\newcommand{\ActionWpsVolDown}{\ButtonScrollFwd}
+\newcommand{\ActionWpsVolUp}{\ButtonScrollBack}
 
 \newcommand{\ActionWpsQuickScreen}{Long \ButtonDown}
 \newcommand{\ActionWpsMenu}{\ButtonDown}
@@ -83,8 +83,8 @@
 \newcommand{\ActionYesNoAccept}{\ButtonSelect}
 
 %Button actions, Setting context
-\newcommand{\ActionSettingInc}{\ButtonScrollUp}
-\newcommand{\ActionSettingDec}{\ButtonScrollDown}
+\newcommand{\ActionSettingInc}{\ButtonScrollBack}
+\newcommand{\ActionSettingDec}{\ButtonScrollFwd}
 
 %Button actions, Virtual Keyboard Context
 \newcommand{\ActionKbdLeft}{\ButtonLeft}
@@ -92,8 +92,8 @@
 \newcommand{\ActionKbdSelect}{\ButtonSelect}
 \newcommand{\ActionKbdDone}{\ButtonUp}
 \newcommand{\ActionKbdAbort}{\ButtonPower}
-\newcommand{\ActionKbdUp}{\ButtonScrollUp}
-\newcommand{\ActionKbdDown}{\ButtonScrollDown}
+\newcommand{\ActionKbdUp}{\ButtonScrollBack}
+\newcommand{\ActionKbdDown}{\ButtonScrollFwd}
 \newcommand{\ActionKbdCursorLeft}{\ButtonRec{} + \ButtonLeft}
 \newcommand{\ActionKbdCursorRight}{\ButtonRec{} + \ButtonRight}
 \newcommand{\ActionKbdBackSpace}{\ButtonDown}
@@ -101,10 +101,10 @@
 
 %Button actions, Pitch Screen context
 \newcommand{\ActionPsToggleMode}{\ButtonRec}
-\newcommand{\ActionPsIncSmall}{\ButtonScrollUp}
-\newcommand{\ActionPsIncBig}{Long \ButtonScrollUp}
-\newcommand{\ActionPsDecSmall}{\ButtonScrollDown}
-\newcommand{\ActionPsDecBig}{Long \ButtonScrollDown}
+\newcommand{\ActionPsIncSmall}{\ButtonScrollBack}
+\newcommand{\ActionPsIncBig}{Long \ButtonScrollBack}
+\newcommand{\ActionPsDecSmall}{\ButtonScrollFwd}
+\newcommand{\ActionPsDecBig}{Long \ButtonScrollFwd}
 \newcommand{\ActionPsNudgeLeft}{\ButtonLeft}
 \newcommand{\ActionPsNudgeRight}{\ButtonRight}
 \newcommand{\ActionPsReset}{\ButtonSelect}
diff --git a/manual/platform/ipod1g2g.tex b/manual/platform/ipod1g2g.tex
index cb1646ea61..c35e60553d 100644
--- a/manual/platform/ipod1g2g.tex
+++ b/manual/platform/ipod1g2g.tex
@@ -31,8 +31,8 @@
 \newcommand{\ButtonMenu}{\btnfnt{Menu}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
 \newcommand{\ButtonSelect}{\btnfnt{Select}}
-\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Fwd}}
-\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Back}}
+\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Forward}}
+\newcommand{\ButtonScrollBack}{\btnfnt{Scroll backward}}
 \newcommand{\ButtonHold}{\btnfnt{Hold}}
 
 %Button actions, standard context
diff --git a/manual/platform/ipod3g.tex b/manual/platform/ipod3g.tex
index 6cd5cbee1c..553658d476 100644
--- a/manual/platform/ipod3g.tex
+++ b/manual/platform/ipod3g.tex
@@ -31,8 +31,8 @@
 \newcommand{\ButtonMenu}{\btnfnt{Menu}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
 \newcommand{\ButtonSelect}{\btnfnt{Select}}
-\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Fwd}}
-\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Back}}
+\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Forward}}
+\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Backward}}
 \newcommand{\ButtonHold}{\btnfnt{Hold}}
 
 %Button actions, standard context
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index 6c7da3b593..ae24e0f4a5 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -31,8 +31,8 @@
 \newcommand{\ButtonMenu}{\btnfnt{Menu}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
 \newcommand{\ButtonSelect}{\btnfnt{Select}}
-\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Fwd}}
-\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Back}}
+\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Forward}}
+\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Backward}}
 \newcommand{\ButtonHold}{\btnfnt{Hold}}
 
 %Button actions, standard context
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index 3d5eb24907..8d4a64b7fa 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -30,8 +30,8 @@
 \newcommand{\ButtonMenu}{\btnfnt{Menu}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
 \newcommand{\ButtonSelect}{\btnfnt{Select}}
-\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Fwd}}
-\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Back}}
+\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Forward}}
+\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Backward}}
 \newcommand{\ButtonHold}{\btnfnt{Hold}}
 
 %Button actions, standard context
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex
index bdc572022a..2c1f6613a5 100644
--- a/manual/platform/ipodmini.tex
+++ b/manual/platform/ipodmini.tex
@@ -32,8 +32,8 @@
 \newcommand{\ButtonMenu}{\btnfnt{Menu}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
 \newcommand{\ButtonSelect}{\btnfnt{Select}}
-\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Fwd}}
-\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Back}}
+\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Forward}}
+\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Backward}}
 \newcommand{\ButtonHold}{\btnfnt{Hold}}
 
 %Button actions, standard context
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex
index 8b6eb97810..76337c38dc 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano.tex
@@ -31,8 +31,8 @@
 \newcommand{\ButtonMenu}{\btnfnt{Menu}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
 \newcommand{\ButtonSelect}{\btnfnt{Select}}
-\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Fwd}}
-\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Back}}
+\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Forward}}
+\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Backward}}
 \newcommand{\ButtonHold}{\btnfnt{Hold}}
 
 %Button actions, standard context
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 16147a8580..2ce9a25e76 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -33,8 +33,8 @@
 \newcommand{\ButtonMenu}{\btnfnt{Menu}}
 \newcommand{\ButtonPlay}{\btnfnt{Play}}
 \newcommand{\ButtonSelect}{\btnfnt{Select}}
-\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Fwd}}
-\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Back}}
+\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Forward}}
+\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Backward}}
 \newcommand{\ButtonHold}{\btnfnt{Hold}}
 
 %Button actions, standard context
diff --git a/manual/plugins/blackjack.tex b/manual/plugins/blackjack.tex
index 2466014c81..933df139ec 100644
--- a/manual/plugins/blackjack.tex
+++ b/manual/plugins/blackjack.tex
@@ -43,8 +43,8 @@ visit\\
     \ButtonLeft/\ButtonRight/\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_C200_PAD}
       {\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
-    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
       & Enter betting amount\\
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index 781666ca78..e5e4aceb85 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -9,8 +9,8 @@ scrolling from right to left.
 \begin{btnmap}{}{}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
     {\ButtonUp\ /\ \ButtonDown}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack\ /\ \ButtonScrollFwd}
-\opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollDown\ /\ \ButtonScrollUp}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack\ /\ \ButtonScrollFwd}
+\opt{IRIVER_H10_PAD}{\ButtonScrollDown\ /\ \ButtonScrollUp}
 & Moves to next/previous option\\
 \ButtonLeft\ /\ \ButtonRight
 & Increases/decreases option value\\
diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index 4019fd365e..1563f4a267 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -27,10 +27,8 @@ must catch it with the paddle. Look out for the bad ones.\\
     \ButtonLeft\ / \ButtonRight
     \opt{SANSA_C200_PAD}{\\
         \ButtonVolDown\ / \ButtonVolUp}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\\
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\\
         \ButtonScrollBack\ / \ButtonScrollFwd}
-    \opt{SANSA_E200_PAD}{\\
-        \ButtonScrollDown\ / \ButtonScrollUp}
     & Moves the paddle\\
     \opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay\ / \ButtonUp}
     \opt{ONDIO_PAD}{\ButtonMenu\ / \ButtonUp}
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index fe1f92b530..a9f9b740d1 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -32,9 +32,9 @@ fired. Points are awarded depending on how quickly the level was completed.
     \opt{IRIVER_H10_PAD}{\ButtonRew}
         & Show high scores\\
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD}{\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
     \opt{ONDIO_PAD,SANSA_C200_PAD}{\ButtonLeft+\ButtonRight}
-    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
         & Select starting level\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
diff --git a/manual/plugins/chip8emulator.tex b/manual/plugins/chip8emulator.tex
index 5c98f3cb9a..80271e0577 100644
--- a/manual/plugins/chip8emulator.tex
+++ b/manual/plugins/chip8emulator.tex
@@ -53,9 +53,9 @@ The default keymappings are:
         % Key "2"
         \begin{sideways}
         \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp}
-        \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack}
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
-        \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp}
+        \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
         \end{sideways}
         &
         % Key "3"
@@ -88,9 +88,9 @@ The default keymappings are:
         % Key "8"
         \begin{sideways}
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonDown}
-        \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd}
         \opt{IAUDIO_X5_PAD}{\ButtonDown}
-        \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollDown}
+        \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
         \end{sideways}
         &
         % Key "9"
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index fac96f5143..43aa2d8121 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -29,8 +29,8 @@ This is a rotating cube screen saver in 3D.
     \opt{PLAYER_PAD}{\ButtonOn+ \ButtonRight/\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD}
         {\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
-    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
     \opt{SANSA_C200_PAD}{\ButtonVolDown\/\ButtonVolUp}
         & Increase / decrease y axis\\
     \opt{PLAYER_PAD}{\ButtonMenu+ \ButtonRight/\ButtonLeft}
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index c976862015..bc9442f42d 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -11,8 +11,8 @@ Demystify is a screen saver like demo.\\
     & Increase / decrease speed\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonRight\ / \ButtonLeft}
-    \opt{IPOD_4G_PAD,IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{IPOD_4G_PAD,IPOD_4G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
     \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonUp\ / \ButtonDown}
     & Add / remove polygon\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
diff --git a/manual/plugins/dice.tex b/manual/plugins/dice.tex
index 4c9545976d..60942f1ccf 100644
--- a/manual/plugins/dice.tex
+++ b/manual/plugins/dice.tex
@@ -10,8 +10,7 @@ dice.
     \opt{PLAYER_PAD}{\ButtonPlay/\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
-    \opt{SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
         & Select number of sides or number of dice\\
     \opt{PLAYER_PAD}{\ButtonOn}
     \opt{RECORDER_PAD}{\ButtonOn/\ButtonPlay}
diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex
index 5b53183b95..6b1979634b 100644
--- a/manual/plugins/doom.tex
+++ b/manual/plugins/doom.tex
@@ -112,14 +112,14 @@ Rockdoom options, you will need to quit your current game and restart the plugin
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD}
     {\ButtonSelect}
   \opt{IRIVER_H10_PAD}{\ButtonRew}
-  \opt{SANSA_E200_PAD}{\ButtonScrollUp}
+  \opt{SANSA_E200_PAD}{\ButtonScrollBack}
     & Enter \\
 %
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
   \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonSelect}
   \opt{IAUDIO_X5_PAD}{\ButtonRec}
   \opt{IRIVER_H10_PAD}{\ButtonFF}
-  \opt{SANSA_E200_PAD}{\ButtonScrollDown}
+  \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
   \opt{GIGABEAT_PAD}{\ButtonVolDown}
     & Change Weapon \\
 %
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index 24069851e4..22687b830e 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -4,9 +4,9 @@
 Fire is a demo displaying a fire effect.
 \begin{table}
     \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
         {\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
     & Increase / decrease number of flames\\
     \opt{RECORDER_PAD}{\ButtonOn}
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index 5d898e9e43..57b9590c53 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -41,7 +41,7 @@ greyscale library}.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{SANSA_E200_PAD}{\ButtonScrollDown}
+    \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
     \opt{GIGABEAT_PAD}{\ButtonA+\ButtonRight}
     & Next jpeg in directory\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
@@ -50,7 +50,7 @@ greyscale library}.
     \opt{IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{SANSA_E200_PAD}{\ButtonScrollUp}
+    \opt{SANSA_E200_PAD}{\ButtonScrollBack}
     \opt{GIGABEAT_PAD}{\ButtonA+\ButtonLeft}
     & Previous jpeg in directory\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index 1f4e6d0a7a..448320ee4d 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -10,18 +10,16 @@ This demonstration draws fractal images from the Mandelbrot set
     \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu\ / \ButtonMenu+\ButtonUp}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD}{\ButtonSelect}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
-    \opt{SANSA_E200_PAD}{\ButtonScrollDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd}
     \opt{SANSA_C200_PAD}{\ButtonVolUp}
     & Zoom in\\
     %
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack}
     \opt{IAUDIO_X5_PAD,GIGABEAT_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
-    \opt{SANSA_E200_PAD}{\ButtonScrollUp}
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
     & Zoom out\\
     %
diff --git a/manual/plugins/metronome.tex b/manual/plugins/metronome.tex
index 22835ddd01..44c2d56a9b 100644
--- a/manual/plugins/metronome.tex
+++ b/manual/plugins/metronome.tex
@@ -7,7 +7,7 @@ on the appropriate button.
   \begin{btnmap}{}{}
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IRIVER_H10_PAD,IAUDIO_X5_PAD}{\ButtonPower}
+    \opt{IRIVER_H10_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonPower}
     \opt{ONDIO_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
         & Exit plugin \\
     \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD}{
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index ae0c802caf..6d54446131 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -34,7 +34,7 @@ the location of a mine, it can be tagged to avoid accidentally
   \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack
   & Scroll through the entire minefield \\}%
   %
-  \opt{SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown
+  \opt{SANSA_E200_PAD}{\ButtonScrollFwd/\ButtonScrollBack
   & Scroll through the entire minefield \\}%
   %
   \opt{RECORDER_PAD}{\ButtonFOne/\ButtonOn}
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index 0d3cbf900e..9dc494f134 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -44,8 +44,8 @@ being played.
     & Pause the demo \\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
-    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
     \opt{SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonVolUp/\ButtonVolDown}
     & Increase / decrease volume\\
     \ButtonRight/\ButtonLeft
diff --git a/manual/plugins/robotfindskitten.tex b/manual/plugins/robotfindskitten.tex
index 1b350199d6..a311194e17 100644
--- a/manual/plugins/robotfindskitten.tex
+++ b/manual/plugins/robotfindskitten.tex
@@ -9,7 +9,8 @@ ends when robotfindskitten.
 \begin{table}
 \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}
+    \opt{SANSA_E200_PAD}{\ButtonScrollFwd, \ButtonScrollBack,}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD}
         {\ButtonUp, \ButtonDown,}%
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
     \ButtonLeft, \ButtonRight
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index 42bafdee19..0f253ac0fb 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -28,10 +28,9 @@ pile of blocks reach the ceiling the game is over.
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{SANSA_E200_PAD}{\ButtonScrollDown}
     \opt{SANSA_C200_PAD}{\ButtonVolDown}
     \opt{GIGABEAT_PAD}{\ButtonVolUp}
         & Rotate left\\
@@ -39,7 +38,8 @@ pile of blocks reach the ceiling the game is over.
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack/\ButtonMenu}
-    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp}
+    \opt{SANSA_E200_PAD}{\ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     \opt{SANSA_C200_PAD}{\ButtonVolUp/\ButtonUp}
     \opt{GIGABEAT_PAD}{\ButtonVolDown}
         & Rotate right\\
diff --git a/manual/plugins/rockboy.tex b/manual/plugins/rockboy.tex
index c267e0b84e..2d99e52f3e 100644
--- a/manual/plugins/rockboy.tex
+++ b/manual/plugins/rockboy.tex
@@ -23,12 +23,12 @@ the gnuboy emulator. To start a game open a ROM file saved as \fname{.gb} or
     \opt{IRIVER_H100_PAD}{\ButtonRec}
     \opt{IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD}{\ButtonSelect}
-    \opt{SANSA_E200_PAD}{\ButtonScrollUp}
+    \opt{SANSA_E200_PAD}{\ButtonScrollBack}
     & Start\\
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD}{
         \opt{RECORDER_PAD}{\ButtonPlay}
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
-        \opt{SANSA_E200_PAD}{\ButtonScrollDown}
+        \opt{SANSA_E200_PAD}{\ButtonScrollFwd}
     & Select\\}
     \opt{RECORDER_PAD}{\ButtonOn & Cycle display scaling modes\\}
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index 072c93d8c3..1c723bd3bb 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -18,8 +18,8 @@ visit\\
     \ButtonLeft/\ButtonRight/\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_C200_PAD}
       {\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
-    \opt{IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
       & Move Cursor around.\\
     %
     \opt{RECORDER_PAD}{\ButtonOn}
diff --git a/manual/plugins/spacerocks.tex b/manual/plugins/spacerocks.tex
index 968279179b..6b496d0eaf 100644
--- a/manual/plugins/spacerocks.tex
+++ b/manual/plugins/spacerocks.tex
@@ -20,9 +20,9 @@ UFO will appear -- shoot this for extra points.
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     & Thrust\\
     %
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
         {\ButtonLeft / \ButtonRight}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack / \ButtonScrollFwd}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack / \ButtonScrollFwd}
     & Turn left/right\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index a738ab195b..f5efebed4a 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -39,7 +39,7 @@ These are \emph{NOT} saved when saving the game.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft/\ButtonSelect/\ButtonRight}
     \opt{IAUDIO_X5_PAD,GIGABEAT_PAD}{\ButtonSelect}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
+    \opt{SANSA_E200_PAD}{\ButtonScrollBack/\ButtonScrollFwd}
     \opt{SANSA_C200_PAD}{\ButtonSelect/\ButtonVolUp/\ButtonVolDown}
     & Change number under the cursor\\
     %
@@ -49,7 +49,7 @@ These are \emph{NOT} saved when saving the game.
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonLeft/\ButtonSelect/\ButtonRight}
     \opt{IAUDIO_X5_PAD,GIGABEAT_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Long \ButtonRew}
-    \opt{SANSA_E200_PAD}{Long \ButtonScrollUp/\ButtonScrollDown}
+    \opt{SANSA_E200_PAD}{Long \ButtonScrollBack/\ButtonScrollFwd}
     \opt{SANSA_C200_PAD}{Long \ButtonSelect/\ButtonVolUp/\ButtonVolDown}
     & Constantly changing the number under the cursor\\
     %
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 0019cd32ec..8d6327470b 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -85,7 +85,7 @@ If file fits on one screen, there is no scrollbar and toggling Scrollbar mode ha
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}
-    \opt{SANSA_E200_PAD}{\ButtonScrollUp}
+    \opt{SANSA_E200_PAD}{\ButtonScrollBack}
         & Toggles Word mode\\
         
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonMenu+\ButtonRight}
diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex
index 29ddcd2dd9..94e238ea69 100644
--- a/manual/plugins/vumeter.tex
+++ b/manual/plugins/vumeter.tex
@@ -30,15 +30,13 @@ and the meter scale can be changed.
     & Settings\\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD}
     {\ButtonUp}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
-\opt{SANSA_E200_PAD}{\ButtonScrollDown}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollFwd}
 \opt{SANSA_C200_PAD}{\ButtonVolUp}
 \opt{IRIVER_H10_PAD}{\ButtonScrollUp}
     & Raise Volume\\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD}
     {\ButtonDown}
-\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
-\opt{SANSA_E200_PAD}{\ButtonScrollUp}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonScrollBack}
 \opt{SANSA_C200_PAD}{\ButtonVolDown}
 \opt{IRIVER_H10_PAD}{\ButtonScrollDown}
     & Lower Volume\\
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 77d7d64d58..7a26074e34 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -203,8 +203,8 @@ paragraph.
   Above and to the left of this, on the outside of the turning wheel are four 
   buttons.  These are the \ButtonUp{}, \ButtonDown{}, \ButtonLeft{} and 
   \ButtonRight{} buttons.  Inside the wheel is the \ButtonSelect{} button.  Turning
-  the wheel to the right activates the \ButtonScrollDown{} function, and to the
-  left, the \ButtonScrollUp{} function.  
+  the wheel to the right activates the \ButtonScrollFwd{} function, and to the
+  left, the \ButtonScrollFwd{} function.  
   
   On the right of the unit is a slot for inserting flash cards.  On the bottom is 
   the connector for the USB cable.  On the left is the \ButtonRec{} button, and