Index: manual/plugins/pictureflow.tex
===================================================================
--- manual/plugins/pictureflow.tex	(revision 23315)
+++ manual/plugins/pictureflow.tex	(working copy)
@@ -25,63 +25,90 @@
 \begin{table}
     \begin{btnmap}{}{}
         \opt{scrollwheel,IRIVER_H10_PAD}{
-          \opt{scrollwheel}{\ButtonScrollFwd{} / \ButtonScrollBack}
-          \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-             \opt{HAVEREMOTEKEYMAP}{& }
-          & Scroll through albums / track list\\}
-           
-        \nopt{scrollwheel,IRIVER_H10_PAD}{\ButtonLeft{} / \ButtonRight
-           \opt{HAVEREMOTEKEYMAP}{& 
-              \opt{GIGABEAT_RC_PAD}{\ButtonRCVolDown{} / \ButtonRCVolUp}
-           }
-        & Scroll through albums\\}
+            \opt{scrollwheel}{\ButtonScrollFwd{} / \ButtonScrollBack}
+            \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
+            }&
+        \opt{HAVEREMOTEKEYMAP}{
+            }&
+        Scroll through albums / track list
+        \\
 
-        \nopt{scrollwheel,IRIVER_H10_PAD}{\ButtonUp{} / \ButtonDown
-           \opt{HAVEREMOTEKEYMAP}{&
-             \opt{GIGABEAT_RC_PAD}{\ButtonRCVolDown{} / \ButtonRCVolUp}
-           }
-        & Scroll through track list\\}
+        \nopt{scrollwheel,IRIVER_H10_PAD,IAUDIO_M3_PAD}{\ButtonLeft{} / %
+                \ButtonRight}
+            &
+        \opt{HAVEREMOTEKEYMAP}{
+            \opt{GIGABEAT_RC_PAD}{\ButtonRCVolDown{} / \ButtonRCVolUp}
+            \opt{IAUDIO_RC_PAD}{\ButtonRCLeft{} / \ButtonRCRight{} / %
+                \ButtonRCDown{} / \ButtonRCUp}
+            }&
+        Scroll through albums
+        \\
 
+        \nopt{scrollwheel,IRIVER_H10_PAD,IAUDIO_M3_PAD}{\ButtonUp{} / %
+                \ButtonDown}
+            &
+        \opt{HAVEREMOTEKEYMAP}{
+            \opt{GIGABEAT_RC_PAD}{\ButtonRCVolDown{} / \ButtonRCVolUp}
+            \opt{IAUDIO_RC_PAD}{\ButtonRCDown{} / \ButtonRCUp}
+            }&
+        Scroll through track list
+        \\
+
         \opt{IRIVER_H10_PAD}{\ButtonRight}
         \opt{ONDIO_PAD}{\ButtonUp}
         \opt{RECORDER_PAD}{\ButtonOn}
-        \nopt{ONDIO_PAD,IRIVER_H10_PAD,RECORDER_PAD}{\ButtonSelect}
-           \opt{HAVEREMOTEKEYMAP}{&
-             \opt{GIGABEAT_RC_PAD}{\ButtonRCFF}
-           }
-        & Enter track list 
+        \nopt{ONDIO_PAD,IRIVER_H10_PAD,RECORDER_PAD,IAUDIO_M3_PAD}{%
+                \ButtonSelect}
+            &
+        \opt{HAVEREMOTEKEYMAP}{
+            \opt{GIGABEAT_RC_PAD}{\ButtonRCFF}
+            \opt{IAUDIO_RC_PAD}{\ButtonRCPlay}
+            }&
+        Enter track list
              \opt{swcodec}{/ Play album from selected track}
         \\
 
-        \ButtonLeft
-           \opt{HAVEREMOTEKEYMAP}{&
-             \opt{GIGABEAT_RC_PAD}{\ButtonRCRew}
-            }
-        & Exit track list\\
+        \nopt{IAUDIO_M3_PAD}{\ButtonLeft}
+            &
+        \opt{HAVEREMOTEKEYMAP}{
+            \opt{GIGABEAT_RC_PAD}{\ButtonRCRew}
+            \opt{IAUDIO_RC_PAD}{\ButtonRCLeft}
+            }&
+        Exit track list
+        \\
 
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
         \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_PAD,%
-             GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
+                GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu}
         \opt{IAUDIO_X5_PAD}{\ButtonRec}
         \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonDown}
         \opt{IRIVER_H10_PAD,SANSA_C200_PAD}{\ButtonPower}
         \opt{RECORDER_PAD}{\ButtonFOne}
         \opt{ONDIO_PAD}{Long \ButtonMenu}
-            \opt{HAVEREMOTEKEYMAP}{&
-              \opt{GIGABEAT_RC_PAD}{\ButtonRCDsp}
-            }
-        & Enter menu\\
+        \opt{IAUDIO_M3_PAD}{}
+            &
+        \opt{HAVEREMOTEKEYMAP}{
+            \opt{GIGABEAT_RC_PAD}{\ButtonRCDsp}
+            \opt{IAUDIO_RC_PAD}{\ButtonRCMenu}
+            }&
+        Enter menu
+        \\
 
-        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{%
+                \ButtonOff}
         \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,%
-             MROBE100_PAD}{\ButtonPower}
+                MROBE100_PAD}{\ButtonPower}
         \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
         \opt{SANSA_C200_PAD,IRIVER_H10_PAD}{Long \ButtonPower}
         \opt{IPOD_1G2G_PAD,IPOD_3G_PAD,IPOD_4G_PAD}{Long \ButtonMenu}
-           \opt{HAVEREMOTEKEYMAP}{&
+        \opt{IAUDIO_M3_PAD}{}
+            &
+        \opt{HAVEREMOTEKEYMAP}{
              \opt{GIGABEAT_RC_PAD}{\ButtonRCRew}
-           }
-        & Exit PictureFlow\\
+            }&
+        Exit PictureFlow
+        \\
+        
     \end{btnmap}
 \end{table}