39 files changed, 187 insertions, 186 deletions

diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index 8fc425d2d3..3a93124e0d 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -9,17 +9,17 @@ scrolling from right to left.
 \begin{btnmap}{}{}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
     {\ButtonUp\ /\ \ButtonDown}
-\opt{IPOD_4G_PAD}{\ButtonScrollBack\ /\ \ButtonScrollFwd}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack\ /\ \ButtonScrollFwd}
 & Moves to next/previous option\\
 \ButtonLeft\ /\ \ButtonRight
 & Increases/decreases option value\\
 \opt{RECORDER_PAD}{\ButtonOn}
 \opt{ONDIO_PAD}{\ButtonMenu}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{\ButtonSelect}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
 \opt{IAUDIO_X5_PAD}{\ButtonPlay}
 & Toggles Scroll mode\\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD}{\ButtonMenu}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
 \opt{IAUDIO_X5_PAD}{\ButtonPower}
 & Exits bounce demo\\
 \end{btnmap}
diff --git a/manual/plugins/brickmania.tex b/manual/plugins/brickmania.tex
index 9308acf9ed..5bfed8b1b1 100644
--- a/manual/plugins/brickmania.tex
+++ b/manual/plugins/brickmania.tex
@@ -27,10 +27,10 @@ must catch it with the paddle. Look out for the bad ones.\\
     \ButtonLeft\ / \ButtonRight & Moves the paddle\\
     \opt{RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
     & Release the ball / Fire\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Open menu / Quit\\
     \end{btnmap}
diff --git a/manual/plugins/bubbles.tex b/manual/plugins/bubbles.tex
index 619a4bd901..cb3a49062d 100644
--- a/manual/plugins/bubbles.tex
+++ b/manual/plugins/bubbles.tex
@@ -12,48 +12,48 @@ fired. Points are awarded depending on how quickly the level was completed.
     \begin{btnmap}{}{}
     \multicolumn{2}{c}{\textbf{In menu}}\\\hline
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay} 
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay} 
     \opt{ONDIO_PAD}{\ButtonMenu}
     & Start new game\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD}{\ButtonLeft+\ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft+\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{\ButtonDown}
         & Resume saved game\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonUp}
         & Show high scores\\
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
     \opt{ONDIO_PAD}{\ButtonLeft+\ButtonRight}
         & Select starting level\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
         & Quit\\\hline
     \multicolumn{2}{c}{\textbf{In game}}\\\hline
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD}{\ButtonPlay} 
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay} 
     \opt{ONDIO_PAD}{\ButtonMenu} 
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
         & Pause game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonLeft/\ButtonRight}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
         & Aim the bubble\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonUp}
         & Fire bubble\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD}{\ButtonLeft+\ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft+\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonRec} 
     \opt{RECORDER_PAD}{\ButtonFOne} 
     \opt{ONDIO_PAD}{\ButtonDown}
         & Save game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower} 
         & Exit to menu\\
     \end{btnmap}
diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index 06f1fd2d4d..1113bd96b7 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -10,12 +10,12 @@ available maths functions on the right hand side.
 \begin{btnmap}{}{}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {Direction keys}
-    \opt{IPOD_4G_PAD}{\ButtonLeft, \ButtonRight, \ButtonScrollFwd,
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft, \ButtonRight, \ButtonScrollFwd,
         \ButtonScrollBack}
     & Move around the keypad\\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}
         {\ButtonSelect}
     & Press a button on the keypad\\
     \opt{RECORDER_PAD}{\ButtonFOne & Delete last entered digit or clear after
@@ -26,11 +26,11 @@ available maths functions on the right hand side.
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{Hold \ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD}{Hold \ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonPlay}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     & Calculate\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index d6b3bee6aa..d0e566e44d 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -10,15 +10,15 @@ used in any kind of game with up to ten players.
     \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
       {\ButtonRight/\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonScrollBack/\ButtonScrollFwd}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack/\ButtonScrollFwd}
       & Increase / decrease displayed Value\\
     \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonRight}
-    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
       & Move to next screen\\
     \opt{PLAYER_PAD}{\ButtonStop}
-    \opt{ONDIO_PAD,IPOD_4G_PAD}{\ButtonMenu}
+    \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
       & Move to previous screen\\
@@ -46,29 +46,29 @@ Keys are as follows:
     \opt{PLAYER_PAD}{\ButtonOn}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
-    \opt{IPOD_4G_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
       & Exit plugin \\
     \opt{PLAYER_PAD}{\ButtonStop}
-    \opt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD}{\ButtonLeft}
+    \opt{RECORDER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
       & Restart round for the current player \\
     \opt{PLAYER_PAD,RECORDER_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonRight}
-    \opt{IPOD_4G_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
       & Pause the time (press again to continue) \\
     \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
       {\ButtonRight}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp}
-    \opt{IPOD_4G_PAD}{\ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
       & Switch to next player \\
     \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
       & Switch to previous player \\
-    \opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD}{\ButtonMenu}
+    \opt{PLAYER_PAD,ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     \opt{IAUDIO_X5_PAD}{\ButtonSelect}
@@ -76,7 +76,7 @@ Keys are as follows:
       \opt{PLAYER_PAD,RECORDER_PAD}{(\ButtonPlay\ to select.)}
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{(\ButtonOn\ to select.)}
       \opt{ONDIO_PAD}{(\ButtonRight\ to select.)}
-      \opt{IPOD_4G_PAD}{(\ButtonSelect\ to select.)}
+      \opt{IPOD_4G_PAD,IPOD_3G_PAD}{(\ButtonSelect\ to select.)}
       \opt{IAUDIO_X5_PAD}{(press again to select.)}\\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/chessbox.tex b/manual/plugins/chessbox.tex
index 50c69dee24..afd98cd457 100644
--- a/manual/plugins/chessbox.tex
+++ b/manual/plugins/chessbox.tex
@@ -9,33 +9,33 @@ you resume the game.
 \subsubsection{Keys}
 \begin{table}
     \begin{btnmap}{}{}
-    \opt{IPOD_4G_PAD}{\ButtonMenu, \ButtonPlay, \ButtonLeft, \ButtonRight}
-    \nopt{IPOD_4G_PAD}{Direction keys} 
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay, \ButtonLeft, \ButtonRight}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{Direction keys} 
     & Move the cursor\\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}
         {\ButtonSelect}
     & Select / Move piece\\
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     & Change level\\
     \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{Hold \ButtonMenu}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     & Force play\\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
     \opt{IAUDIO_X5_PAD}{\ButtonSelect+\ButtonPlay}
     & Restart Game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
diff --git a/manual/plugins/chip8emulator.tex b/manual/plugins/chip8emulator.tex
index 8d0877cdd4..867fbc5b57 100644
--- a/manual/plugins/chip8emulator.tex
+++ b/manual/plugins/chip8emulator.tex
@@ -39,7 +39,7 @@ Default keymappings:
        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff & & \ButtonUp & &
             \ButtonLeft & \ButtonSelect & \ButtonRight & & \ButtonDown & & & &
             & & &}
-       \opt{IPOD_4G_PAD}{\ButtonMenu & & & \ButtonScrollBack & & \ButtonLeft &
+       \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu & & & \ButtonScrollBack & & \ButtonLeft &
             \ButtonPlay & \ButtonRight & & \ButtonScrollFwd & & & & & & &}
        \opt{IAUDIO_X5_PAD}{\ButtonPower & & & \ButtonUp & & \ButtonLeft &
             \ButtonSelect & \ButtonRight & & \ButtonDown & & & & & & &}
diff --git a/manual/plugins/clock.tex b/manual/plugins/clock.tex
index 8b022f0280..79d51102d8 100644
--- a/manual/plugins/clock.tex
+++ b/manual/plugins/clock.tex
@@ -8,16 +8,16 @@ This is a fully featured analogue and digital clock plugin.
 \begin{table}
 \begin{btnmap}{}{}
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
     & Start / Stop Counter \\
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
     (Hold) & Reset Counter \\
     \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD,IRIVER_H300_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H300_PAD}{\ButtonSelect}
     & Main Menu \\
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Save Settings (if enabled) and Exit \\
 \end{btnmap}
diff --git a/manual/plugins/cube.tex b/manual/plugins/cube.tex
index e7795067e9..77da13f58e 100644
--- a/manual/plugins/cube.tex
+++ b/manual/plugins/cube.tex
@@ -6,17 +6,17 @@ This is a rotating cube screen saver in 3D.
     \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
         & Display at maximum frame rate\\
-    \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
         & Pause\\
     \opt{PLAYER_PAD,ONDIO_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonSelect}
         & Cycle draw mode\\
     \ButtonRight/\ButtonLeft
@@ -24,18 +24,18 @@ 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}
         {\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
         & Increase / decrease y axis\\
     \opt{PLAYER_PAD}{\ButtonMenu+ \ButtonRight/\ButtonLeft}
     \opt{RECORDER_PAD}{\ButtonFTwo/\ButtonFOne}
     \opt{ONDIO_PAD}{\ButtonMenu+ \ButtonUp/\ButtonDown}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+ \ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+ \ButtonRight/\ButtonLeft}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+ \ButtonRight/\ButtonLeft}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay+ \ButtonUp/\ButtonDown}
         & Increase / decrease z axis\\
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
         & Quit\\
     \end{btnmap}
diff --git a/manual/plugins/demystify.tex b/manual/plugins/demystify.tex
index 7856b96698..32685c1678 100644
--- a/manual/plugins/demystify.tex
+++ b/manual/plugins/demystify.tex
@@ -6,15 +6,15 @@ Demystify is a screen saver like demo.\\
     \begin{btnmap}{}{}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonRight\ / \ButtonLeft}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonRight\ / \ButtonLeft}
         & Add / remove polygon\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonRight\ / \ButtonLeft}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     \opt{IAUDIO_X5_PAD}{\ButtonUp\ / \ButtonDown}
         & Increase / decrease speed\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_4G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
         & Quit\\
     \end{btnmap}
diff --git a/manual/plugins/dice.tex b/manual/plugins/dice.tex
index a2afd084e6..40d648a863 100755
--- a/manual/plugins/dice.tex
+++ b/manual/plugins/dice.tex
@@ -10,17 +10,17 @@ 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}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
         & Select number of sides or number of dice\\
     \opt{PLAYER_PAD}{\ButtonOn}\opt{RECORDER_PAD}{\ButtonOn/\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}\opt{IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonOn/\ButtonSelect}
-    \opt{IPOD_4G_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_4G_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD}{\ButtonSelect/\ButtonPlay}
         & Roll dice\\
     \opt{PLAYER_PAD}{\ButtonMenu}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{Long press on \ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long press on \ButtonPlay}
     \opt{IAUDIO_x5_PAD}{\ButtonPower}
         & Quit\\
     \end{btnmap}
diff --git a/manual/plugins/fire.tex b/manual/plugins/fire.tex
index f15833560d..a3cc890710 100644
--- a/manual/plugins/fire.tex
+++ b/manual/plugins/fire.tex
@@ -6,20 +6,20 @@ Fire is a demo displaying a fire effect.
     \begin{btnmap}{}{}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     & 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}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD}{\ButtonLeft}
     & Toggle flame type\\
     \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonRight}
+    \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     & Toggle moving flames\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index 43471bfbb9..49a248d85f 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -9,32 +9,32 @@ a screen containing tokens of only one colour.
 \begin{btnmap}{}{}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
     {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
-\opt{IPOD_4G_PAD}{\ButtonMenu/\ButtonPlay/\ButtonLeft/\ButtonRight}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay/\ButtonLeft/\ButtonRight}
     & Move the cursor \\
 \opt{RECORDER_PAD}{\ButtonPlay}
 \opt{ONDIO_PAD}{\ButtonMenu}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
     & Flip \\
 \opt{RECORDER_PAD}{\ButtonFOne}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
 \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonLeft}
     & Shuffle \\
 \opt{RECORDER_PAD}{\ButtonFTwo}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
 \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonRight}
     & Solve \\
 \opt{RECORDER_PAD}{\ButtonFThree}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
 \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonUp}
     & Solve step by step \\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit the game \\
 \end{btnmap}
diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex
index f6163d16bc..b8b56685df 100644
--- a/manual/plugins/jewels.tex
+++ b/manual/plugins/jewels.tex
@@ -52,7 +52,7 @@ after every one hundred points and randomly clears several jewels.
     \end{btnmap}
   \end{table}
 }
-\opt{IPOD_4G_PAD}{
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{
   \begin{table}
     \begin{btnmap}{}{}
       \ButtonLeft, \ButtonRight, \ButtonMenu\ and \ButtonPlay
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index ffa9f1fe75..a7802b6822 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -9,35 +9,35 @@ view a bigger file you may need to stop playback.}
 \begin{btnmap}{}{}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonMenu\ / \ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay}
         / \ButtonLeft\ / \ButtonRight
     & Move around in zoomed in image\\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
     & Zoom in\\
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD}{\ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
     \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect}
     & Zoom out\\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
     \opt{IRIVER_H100_PAD}{\ButtonOn}
     \opt{IRIVER_H300_PAD}{\ButtonRec}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     & Next jpeg in folder\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD}{\ButtonRec}
     \opt{IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
     & Previous jpeg in folder\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Show menu\\
 \end{btnmap}
diff --git a/manual/plugins/logo.tex b/manual/plugins/logo.tex
index a938ec93c4..63a3be7873 100644
--- a/manual/plugins/logo.tex
+++ b/manual/plugins/logo.tex
@@ -8,11 +8,11 @@ Demo showing the Rockbox logo bouncing around the screen.
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight / \ButtonOn+\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
     & Increase / decrease speed on the y-axis\\
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index cd60a0b55e..8537735a0c 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -54,11 +54,11 @@ text files, chip8 games), or from the \setting{Open with} option on the
 
 \opt{HAVE_LCD_BITMAP}{\input{plugins/star.tex}}
 
-\opt{recorder,recorderv2fm,ondio,h1xx,h300,ipod4g,ipodcolor,ipodnano,ipodvideo,x5}{\input{plugins/sudoku.tex}}
+\opt{recorder,recorderv2fm,ondio,h1xx,h300,ipod3g,ipod4g,ipodcolor,ipodnano,ipodvideo,x5}{\input{plugins/sudoku.tex}}
 
 \opt{HAVE_LCD_BITMAP}{\input{plugins/tetrox.tex}}
 
-\opt{recorder,recorderv2fm,ondio,h1xx,h300,IPOD_4G_PAD}{\input{plugins/wormlet.tex}}
+\opt{recorder,recorderv2fm,ondio,h1xx,h300,IPOD_4G_PAD,IPOD_3G_PAD}{\input{plugins/wormlet.tex}}
 
 \opt{SWCODEC}{\input{plugins/xobox.tex}}
 
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index 7b378b2483..11439dc84b 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -8,33 +8,33 @@ Arrow keys & Move about the image\\
 \opt{RECORDER_PAD}{\ButtonPlay}
 \opt{ONDIO_PAD}{\ButtonMenu\ / \ButtonMenu+\ButtonUp}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
-\opt{IPOD_4G_PAD}{\ButtonScrollFwd}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
 & Zoom in\\
 \opt{RECORDER_PAD}{\ButtonOn}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-\opt{IPOD_4G_PAD}{\ButtonScrollBack}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
 \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect}
 & Zoom out\\
 \opt{RECORDER_PAD}{\ButtonFOne}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonLeft}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
 \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonLeft}
 & Decrease iteration depth (less detail)\\
 \opt{RECORDER_PAD}{\ButtonFTwo}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn+\ButtonRight}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
 \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonRight}
 & Increase iteration depth (more detail)\\
 \opt{RECORDER_PAD}{\ButtonFThree}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
 & Reset and return to the default image\\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD}{\ButtonPower}
 & Quit\\
 \end{btnmap}
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index 05b41ed89c..a24b8b5def 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -4,12 +4,12 @@
 The classic game of minesweeper. Use 
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
     {the \ButtonUp\ and \ButtonDown\ keys}
-\opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack }
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack }
 to select the required percentage of mines to set the difficulty 
 then press the 
 \opt{RECORDER_PAD}{\ButtonOn}
 \opt{ONDIO_PAD}{\ButtonMenu}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{\ButtonSelect}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
 \opt{IAUDIO_X5_PAD}{\ButtonRec}key to begin.
 
 The aim of the game is to uncover all of the squares on the board.  If a
@@ -22,7 +22,7 @@ the location of a mine, it can be tagged to avoid accidentally
 
 \begin{table}
  \begin{btnmap}{}{}
-  \opt{IPOD_4G_PAD}{\ButtonMenu/\ButtonPlay/\ButtonLeft/\ButtonRight}
+  \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}
         {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
   & Move the cursor across the minefield \\
@@ -30,25 +30,25 @@ the location of a mine, it can be tagged to avoid accidentally
   \opt{RECORDER_PAD}{\ButtonFOne}
   \opt{ONDIO_PAD}{\ButtonMenu}
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-  \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay} 
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay} 
   & Toggle flag on / off \\
   %
   \opt{RECORDER_PAD}{\ButtonFTwo}
   \opt{ONDIO_PAD}{Hold \ButtonMenu}
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
-  \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
   & Reveal the contents of the current square \\
   %
   \opt{RECORDER_PAD}{\ButtonFThree}
   \opt{ONDIO_PAD}{Hold \ButtonMenu+\ButtonOff}
   \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-  \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
   \opt{IAUDIO_X5_PAD}{\ButtonRec+\ButtonPlay}
   & Display the current game status \\
   %
   \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
   \opt{IAUDIO_X5_PAD}{\ButtonPower}
-  \opt{IPOD_4G_PAD}{\ButtonMenu}
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
   & Exit the game \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/mosaic.tex b/manual/plugins/mosaic.tex
index fcd880150a..6e9c53a8b0 100644
--- a/manual/plugins/mosaic.tex
+++ b/manual/plugins/mosaic.tex
@@ -5,6 +5,6 @@ This simple graphics demo draws a mosaic picture on the screen of the \dap.
 Press 
 \opt{PLAYER_PAD}{\ButtonStop}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD}{\ButtonMenu}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
 \opt{IAUDIO_X5_PAD}{\ButtonPower}
 to quit.
diff --git a/manual/plugins/oscilloscope.tex b/manual/plugins/oscilloscope.tex
index e202faf384..1936455ba7 100644
--- a/manual/plugins/oscilloscope.tex
+++ b/manual/plugins/oscilloscope.tex
@@ -16,33 +16,33 @@ being played.
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     & Toggle filled / curve / plot \\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
     & Toggle whether to scroll or not \\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
     \opt{IAUDIO_X5_PAD}{Hold \ButtonSelect}
     & Toggle drawing orientation \\
-    \opt{RECORDER_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     & Pause the demo \\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp\/\ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd\/\ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\/\ButtonScrollBack}
     & Increase / decrease volume\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,
         IAUDIO_X5_PAD}{\ButtonRight\/\ButtonLeft}
     & Increase / decrease speed\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Exit demo \\
 \end{btnmap}
diff --git a/manual/plugins/pacbox.tex b/manual/plugins/pacbox.tex
index a9a445b591..dbb9e4e434 100644
--- a/manual/plugins/pacbox.tex
+++ b/manual/plugins/pacbox.tex
@@ -29,27 +29,27 @@ found at \url{http://www.mame.net}.
 \subsubsection{Keys}
 \begin{table}
   \begin{btnmap}{}{}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}{\ButtonRight}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonRight}
     & Move Up\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}{\ButtonLeft}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
     & Move Down\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     & Move Left\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     & Move Right\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{IPOD_4G_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
     & Insert Coin\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}{\ButtonSelect} 
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect} 
     & 1-Player Start\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD}{n/a}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{n/a}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & 2-Player Start\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     & Menu\\
   \end{btnmap}
diff --git a/manual/plugins/plasma.tex b/manual/plugins/plasma.tex
index ebd398323a..319309c730 100644
--- a/manual/plugins/plasma.tex
+++ b/manual/plugins/plasma.tex
@@ -5,16 +5,16 @@ Plasma is a demo displaying a 80's style retro plasma effect.
 
 \begin{table}
     \begin{btnmap}{}{}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \nopt{IPOD_4G_PAD}{\ButtonUp\ / \ButtonDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonUp\ / \ButtonDown}
     & Adjust frequency\\
     \opt{HAVE_LCD_COLOR}{
-        \opt{IRIVER_H300_PAD,IPOD_4G_PAD}{\ButtonSelect}
+        \opt{IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
         \opt{IAUDIO_X5_PAD}{\ButtonPlay}
         & Change colours\\
     }
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
diff --git a/manual/plugins/pong.tex b/manual/plugins/pong.tex
index fda8f0fca8..a004685b57 100644
--- a/manual/plugins/pong.tex
+++ b/manual/plugins/pong.tex
@@ -7,25 +7,25 @@ Pong is a simple two player ``tennis game''. Whenever a player misses the ball t
     \opt{RECORDER_PAD}{\ButtonFOne}
         \opt{ONDIO_PAD}{\ButtonLeft}
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
-    \opt{IPOD_4G_PAD}{\ButtonMenu} 
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu} 
     & Left player up\\
-    \opt{RECORDER_PAD,IPOD_4G_PAD}{\ButtonLeft}
+    \opt{RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft}
     \opt{ONDIO_PAD}{\ButtonMenu}
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown} 
     & Left player down\\
     \opt{RECORDER_PAD}{\ButtonFThree}
         \opt{ONDIO_PAD}{\ButtonUp}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-        \opt{IPOD_4G_PAD}{\ButtonRight}
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonRight}
         \opt{IAUDIO_X5_PAD}{\ButtonRec}
     & Right player up\\
     \opt{RECORDER_PAD}{\ButtonRight}
         \opt{ONDIO_PAD}{\ButtonDown}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-        \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay} 
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay} 
     & Right player down\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
         \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index dd72cdb71d..daea813ade 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -10,26 +10,26 @@ Key controls:
   \begin{btnmap}{}{}
   \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5}
     {\ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown}
-  \opt{IPOD_4G_PAD}{\fixme{tbd}}
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\fixme{tbd}}
   & Move Tile \\
   %
   \opt{RECORDER_PAD}{\ButtonFOne}
   \opt{ONDIO_PAD}{Hold \ButtonMenu}
   \opt{h1xx,h300}{\ButtonSelect} 
   \opt{x5}{\fixme{TBD}}
-  \opt{IPOD_4G_PAD}{\fixme{TBD}} 
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\fixme{TBD}} 
   & Shuffle \\
   %
   \opt{RECORDER_PAD}{\ButtonFTwo}
   \opt{ONDIO_PAD}{\ButtonMenu}
   \opt{h1xx,h300}{\ButtonOn} 
   \opt{x5}{\fixme{TBD}}
-  \opt{IPOD_4G_PAD}{\fixme{TBD}} 
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\fixme{TBD}} 
   & Change between picture and numbered tiles \\
   %
   \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
   \opt{x5}{\fixme{TBD}}
-  \opt{IPOD_4G_PAD}{\fixme{TBD}} 
+  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\fixme{TBD}} 
   & Stop the game \\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/snake2.tex b/manual/plugins/snake2.tex
index d52870ed84..03324e9e11 100644
--- a/manual/plugins/snake2.tex
+++ b/manual/plugins/snake2.tex
@@ -12,34 +12,34 @@ into itself.
     \multicolumn{2}{c}{\textbf{In menu}}\\\hline
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp/\ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
         & Set game speed\\
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD}
+    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD}
         {\ButtonRight/\ButtonLeft}
     \opt{ONDIO_PAD}{\ButtonRight}
         & Select starting maze\\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
         & Select game type (A or B)\\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
         & Start the game\\\hline
     \multicolumn{2}{c}{\textbf{In game}}\\\hline
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp/\ButtonDown/\ButtonLeft/\ButtonRight}
-    \opt{IPOD_4G_PAD}{\ButtonMenu/\ButtonPlay/\ButtonLeft/\ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay/\ButtonLeft/\ButtonRight}
         & Steer the snake\\
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
         & Pause and resume the game\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
         & Quit\\
     \end{btnmap}
diff --git a/manual/plugins/snow.tex b/manual/plugins/snow.tex
index 91d130772d..466e515681 100644
--- a/manual/plugins/snow.tex
+++ b/manual/plugins/snow.tex
@@ -5,4 +5,4 @@ you will love this demo.  Or maybe not.
 %
 \opt{player}{Press \ButtonStop\ to quit.}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRVER_H300_PAD}{Press \ButtonOff\ to quit.}
-\opt{IPOD_4G_PAD}{Press \ButtonMenu\ to quit.}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{Press \ButtonMenu\ to quit.}
diff --git a/manual/plugins/sokoban.tex b/manual/plugins/sokoban.tex
index 564ea32d1e..99f99eb6aa 100644
--- a/manual/plugins/sokoban.tex
+++ b/manual/plugins/sokoban.tex
@@ -9,33 +9,33 @@ can only be pushed, never pulled, and only one can be pushed at a time.
 \begin{btnmap}{}{}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
     {\ButtonUp, \ButtonDown,}
-\opt{IPOD_4G_PAD}{\ButtonMenu, \ButtonPlay,}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay,}
     \ButtonLeft, \ButtonRight
     & Move the ``sokoban'' up, down, left or right\\
 \opt{RECORDER_PAD}{\ButtonFOne}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
 \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonDown}
     & Back to previous level \\
 \opt{RECORDER_PAD}{\ButtonFTwo}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
 \opt{IAUDIO_X5_PAD}{\ButtonRec}
     & Restart level \\
 \opt{RECORDER_PAD}{\ButtonFThree}
 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
 \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
 \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonUp}
     & Go to next level \\
 \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
 \opt{ONDIO_PAD}{\ButtonMenu}
-\opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
     & Undo last movement \\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
 \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Exit sokoban \\
 \end{btnmap}
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index 7ddf7cc1a8..cda624ab3b 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -17,17 +17,17 @@ visit\\
   \begin{btnmap}{}{}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
       {\ButtonLeft, \ButtonRight, \ButtonUp, \ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonLeft, \ButtonRight, \ButtonMenu, \ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft, \ButtonRight, \ButtonMenu, \ButtonPlay}
       & Move Cursor around.\\
     %
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
       & Select cards, move cards, reveal hidden cards...\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD}{\ButtonSelect + \ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect + \ButtonPlay}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{Hold \ButtonMenu}
       & If a card was selected -- unselect it, else\\
@@ -35,21 +35,21 @@ visit\\
     %
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonLeft}
-    \opt{IPOD_4G_PAD}{\ButtonSelect + \ButtonLeft}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect + \ButtonLeft}
     \opt{IAUDIO_X5_PAD}{\ButtonRec + \ButtonLeft}
     \opt{ONDIO_PAD}{Hold \ButtonLeft}
       & Put the card from the top of the remains stack on top of the cursor\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Hold \ButtonSelect}
-    \opt{IPOD_4G_PAD}{\ButtonSelect + \ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect + \ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonRec + \ButtonUp}
     \opt{ONDIO_PAD}{Hold \ButtonRight}
       & Put the card under the cursor on one of the 4 final colour stacks.\\
     %
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonRight}
-    \opt{IPOD_4G_PAD}{\ButtonLeft + \ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft + \ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonRec + \ButtonDown}
     \opt{ONDIO_PAD}{Hold \ButtonUp}
       & Put the card on top of the remains stack on one of the final colour stacks.\\
diff --git a/manual/plugins/spacerocks.tex b/manual/plugins/spacerocks.tex
index 7dad6b74f9..ec467b024c 100644
--- a/manual/plugins/spacerocks.tex
+++ b/manual/plugins/spacerocks.tex
@@ -9,33 +9,33 @@ UFO will appear -- shoot this for extra points.
     %
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
     & Shoot\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonUp}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     & Forward\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonLeft / \ButtonRight}
-    \opt{IPOD_4G_PAD}{\ButtonScrollBack / \ButtonScrollFwd}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack / \ButtonScrollFwd}
     & Turn left/right\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
         {\ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     & Teleport\\
     %
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     & Pause game\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
     \end{btnmap}
diff --git a/manual/plugins/star.tex b/manual/plugins/star.tex
index 661ccd8807..46a0bfa6b8 100644
--- a/manual/plugins/star.tex
+++ b/manual/plugins/star.tex
@@ -17,36 +17,36 @@ could not otherwise reach. The block cannot take ``o''s.
     \ButtonRight
         & Move Right\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
         & Move Up\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
         & Move Down\\ 
     \opt{RECORDER_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
         & Switch between circle and square\\
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode+\ButtonLeft}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonDown}
         & Previous level\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode+\ButtonUp}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonRight}
         & Reset level \\
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode+\ButtonRight}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay+\ButtonRight}
         & Next level \\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
         & Exit the game \\
   \end{btnmap}
diff --git a/manual/plugins/starfield.tex b/manual/plugins/starfield.tex
index 200d339d9a..df7503d548 100644
--- a/manual/plugins/starfield.tex
+++ b/manual/plugins/starfield.tex
@@ -6,12 +6,12 @@ Starfield simulation (like the classic screensaver).
 \begin{table}
     \begin{btnmap}{}{}
     \ButtonRight\ / \ButtonLeft & Increase / decrease number of stars\\
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \nopt{IPOD_4G_PAD}{\ButtonUp\ / \ButtonDown}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonUp\ / \ButtonDown}
     & Increase / decrease speed\\
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
-    \nopt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonOff}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonOff}
     & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/stats.tex b/manual/plugins/stats.tex
index 994bda1acd..7a4c335e63 100755
--- a/manual/plugins/stats.tex
+++ b/manual/plugins/stats.tex
@@ -1,9 +1,10 @@
 \subsection{Stats}
 \screenshot{plugins/images/ss-stats}{The stats-plugin}{}
 The stats-plugin simply counts the number of files%
-\opt{h1xx,h300,ipodcolor,ipod4g,ipodmini,ipodnano,ipodvideo}{, music files }
+\opt{h1xx,h300,ipodcolor,ipod3g,ipod4g,ipodmini,ipodnano,ipodvideo}{, music 
+files }
 and folders on your \dap. Press %
 \opt{player}{\ButtonStop}
 \opt{recorder,recorderv2,ondio,h1xx,h300}{\ButtonOff}
-\opt{ipodcolor,ipod4g,ipodmini,ipodnano,ipodvideo}{\fixme:TBD}
+\opt{ipodcolor,ipod3g,ipod4g,ipodmini,ipodnano,ipodvideo}{\fixme:TBD}
 to exit the plugin.
\ No newline at end of file
diff --git a/manual/plugins/sudoku.tex b/manual/plugins/sudoku.tex
index cb641dffe5..b1f82000cf 100644
--- a/manual/plugins/sudoku.tex
+++ b/manual/plugins/sudoku.tex
@@ -28,32 +28,32 @@ These are \emph{NOT} saved when saving the game.
     \begin{btnmap}{}{}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
     {\ButtonUp, \ButtonDown, \ButtonLeft, \ButtonRight}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd/\ButtonScrollBack}
     & Move the cursor\\
     %
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect/\ButtonOn}
-    \opt{IPOD_4G_PAD}{\ButtonLeft/\ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft/\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonSelect}
     & Change number under the cursor\\
     %
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{Long press on \ButtonMenu}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay} 
     & Open Menu\\
     %
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{IPOD_4G_PAD}{\ButtonPlay} 
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay} 
     & Add/Remove number to scratchpad\\
     %
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
-    \opt{IPOD_4G_PAD}{Menu $\rightarrow$ Quit}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Menu $\rightarrow$ Quit}
     & Quit\\
     %
     \end{btnmap}
diff --git a/manual/plugins/text_editor.tex b/manual/plugins/text_editor.tex
index df7085664d..41f69f45ac 100644
--- a/manual/plugins/text_editor.tex
+++ b/manual/plugins/text_editor.tex
@@ -21,17 +21,17 @@ the virtual keyboard.
 \begin{table}
     \begin{btnmap}{}{}
     \opt{RECORDER_PAD}{\ButtonPlay}\opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonSelect} 
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect} 
     & Edit Line / Select Character\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}\opt{IAUDIO_X5_PAD}{\ButtonPower} 
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}\opt{IAUDIO_X5_PAD}{\ButtonPower} 
     & Exit / Abort Editing\\
     \opt{RECORDER_PAD}{\ButtonFOne}\opt{ONDIO_PAD}{Hold \ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}\opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay} 
     & Show Item Menu / Accept Line\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec & Delete Line / Delete Character\\}
-    \opt{IPOD_4G_PAD}{\ButtonLeft & Delete Line / Delete Character\\}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft & Delete Line / Delete Character\\}
     \end{btnmap}
 \end{table}
 
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 36d25367df..162951d570 100644
--- a/manual/plugins/text_viewer.tex
+++ b/manual/plugins/text_viewer.tex
@@ -27,7 +27,7 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
         \item[Narrow] sets maximum column to the screen width.
         \item[Wide] sets maximum column to 114. Useful for navigating large files. (Currently, Wide and Join cannot be selected together.)
     \end{description}
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{
 \item[Page mode] toggles between Normal and Overlap.
     \begin{description}
         \item[Normal] sets page{}-down/page{}-up to one full screen.
@@ -41,27 +41,27 @@ files without a \fname{.txt} extension by using \emph{Open with} from the
 }
 \end{description}
 Settings are not remembered after the viewer has been exited.
-\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD}{
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD}{
 If file fits on one screen, there is no scrollbar and toggling Scrollbar mode has no effect.}
 
 \begin{table}
     \begin{btnmap}{}{}
     \opt{PLAYER_PAD}{\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
-    \opt{IPOD_4G_PAD}{\ButtonScrollBack} 
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack} 
         & Page{}-up (one screen up)\\
         
     \opt{PLAYER_PAD}{\ButtonRight}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonDown}
-    \opt{IPOD_4G_PAD}{\ButtonScrollFwd} 
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd} 
     & Page{}-down (one screen down)\\
         
     \opt{PLAYER_PAD}{\ButtonMenu+\ButtonLeft}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonLeft} 
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonLeft} 
     & Top of file (Narrow mode) One screen left (Wide mode)\\
         
     \opt{PLAYER_PAD}{\ButtonMenu+\ButtonRight}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}
         {\ButtonRight} 
     & Bottom of file (Narrow mode) One screen right (Wide mode)\\
         
@@ -81,14 +81,14 @@ If file fits on one screen, there is no scrollbar and toggling Scrollbar mode ha
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonLeft}\opt{IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}\opt{IAUDIO_X5_PAD}{\ButtonPlay}
         & Toggles Word mode\\
         
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonMenu+\ButtonRight}
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonUp}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IAUDIO_X5_PAD}{Long press on \ButtonPlay}
         & Cycles line mode\\
         
@@ -96,26 +96,26 @@ If file fits on one screen, there is no scrollbar and toggling Scrollbar mode ha
     \opt{RECORDER_PAD}{\ButtonFThree}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonRight}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
         & Toggles view mode\\
         
     \opt{RECORDER_PAD}{\ButtonOn+\ButtonFOne & Toggles page mode\\}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown & Toggles page mode\\}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonOn+\ButtonMode & Toggles page mode\\}
-    \opt{IPOD_4G_PAD}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}
         {\ButtonSelect+\ButtonMenu+\ButtonLeft & Toggles page mode\\}
         
     \opt{RECORDER_PAD}{\ButtonOn+\ButtonFThree & Toggles scrollbar mode\\}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonOff & Toggles scrollbar mode\\}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonOn+\ButtonRec & Toggles scrollbar mode\\}
-    \opt{IPOD_4G_PAD}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}
         {\ButtonSelect+\ButtonLeft+\ButtonRight & Toggles scrollbar mode\\}
         
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
         & Exit text viewer\\
     \end{btnmap}
diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex
index 93299991fe..f477c1dc26 100644
--- a/manual/plugins/vumeter.tex
+++ b/manual/plugins/vumeter.tex
@@ -12,24 +12,24 @@ and the meter scale can be changed.
 \begin{table}
 \begin{btnmap}{}{}
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-\opt{IPOD_4G_PAD}{\ButtonMenu}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
 \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Save settings and quit\\
 \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
 \opt{ONDIO_PAD}{\ButtonMenu}
-\opt{IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
     & Help\\
 \opt{RECORDER_PAD}{\ButtonFOne}
 \opt{ONDIO_PAD}{Hold \ButtonMenu}
-\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+\opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
     & Settings\\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
 {\ButtonUp}
-\opt{IPOD_4G_PAD}{\ButtonScrollFwd}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
     & Raise Volume\\
 \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
 {\ButtonDown}
-\opt{IPOD_4G_PAD}{\ButtonScrollBack}
+\opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
     & Lower Volume\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/wormlet.tex b/manual/plugins/wormlet.tex
index 73d666c465..ef64e3d12d 100644
--- a/manual/plugins/wormlet.tex
+++ b/manual/plugins/wormlet.tex
@@ -21,7 +21,7 @@ Menu controls:}
     \opt{RECORDER_PAD}{
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
             {\ButtonUp\ / \ButtonDown}
-            \opt{IPOD_4G_PAD}{\ButtonMenu\ / \ButtonPlay} & Selects number of players\\
+            \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay} & Selects number of players\\
         \ButtonFOne & Selects game mode.\\}
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/xobox.tex b/manual/plugins/xobox.tex
index 0a88c13118..b17c3171bd 100644
--- a/manual/plugins/xobox.tex
+++ b/manual/plugins/xobox.tex
@@ -9,16 +9,16 @@ To finish a level you have to section off more than 75\%.
 
 \begin{table}
 \begin{btnmap}{}{}
-    \opt{IPOD_4G_PAD}{\ButtonMenu, \ButtonPlay,}
-    \nopt{IPOD_4G_PAD}{\ButtonUp, \ButtonDown,}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay,}
+    \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonUp, \ButtonDown,}
     \ButtonLeft, \ButtonRight
     & Move around the arena\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     & Pause\\
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPower}
     & Quit\\
 \end{btnmap}