Index: manual/plugins/pictureflow.tex
===================================================================
--- manual/plugins/pictureflow.tex	(revision 23318)
+++ manual/plugins/pictureflow.tex	(working copy)
@@ -25,52 +25,59 @@
 \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\\}
+            \ActionStdPrev{} / \ActionStdNext
+                &
+            \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\\}
+        \nopt{scrollwheel,IRIVER_H10_PAD}{
+            \nopt{IAUDIO_M3_PAD}{\ButtonLeft{} / \ButtonRight}
+                &
+            \opt{HAVEREMOTEKEYMAP}{
+                \opt{IAUDIO_M3_PAD}{\ButtonRCLeft{} / \ButtonRCRight}
+                \opt{GIGABEAT_RC_PAD}{\ButtonRCVolDown{} / \ButtonRCVolUp}
+                &}
+            Scroll through albums
+                \\
 
-        \nopt{scrollwheel,IRIVER_H10_PAD}{\ButtonUp{} / \ButtonDown
-           \opt{HAVEREMOTEKEYMAP}{&
-             \opt{GIGABEAT_RC_PAD}{\ButtonRCVolDown{} / \ButtonRCVolUp}
-           }
-        & Scroll through track list\\}
+            \nopt{IAUDIO_M3_PAD}{\ButtonUp{} / \ButtonDown}
+                &
+            \opt{HAVEREMOTEKEYMAP}{
+                \opt{IAUDIO_M3_PAD}{\ButtonRCUp{} / \ButtonRCDown}
+                \opt{GIGABEAT_RC_PAD}{\ButtonRCVolDown{} / \ButtonRCVolUp}
+                &}
+            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 
-             \opt{swcodec}{/ Play album from selected track}
-        \\
+        \nopt{IAUDIO_M3_PAD}{\ActionStdOk}
+            &
+        \opt{HAVEREMOTEKEYMAP}{
+            \opt{IAUDIO_M3_PAD}{\ActionRCStdOk}
+            &}
+        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}{\ActionStdCancel}
+            &
+        \opt{HAVEREMOTEKEYMAP}{
+            \opt{IAUDIO_M3_PAD}{\ActionRCStdCancel}
+            \opt{GIGABEAT_RC_PAD}{\ButtonRCRew}
+            &}
+        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}
-        \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\\
+        \nopt{IAUDIO_M3_PAD}{\ActionStdMenu}
+            &
+        \opt{HAVEREMOTEKEYMAP}{
+            \opt{IAUDIO_M3_PAD}{\ActionRCStdMenu}
+            \opt{GIGABEAT_RC_PAD}{\ButtonRCDsp}
+            &}
+        Enter menu
+            \\
 
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
         \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,%
@@ -78,10 +85,14 @@
         \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{GIGABEAT_RC_PAD}{\ButtonRCRew}
-           }
-        & Exit PictureFlow\\
+            &
+        \opt{HAVEREMOTEKEYMAP}{
+            \opt{IAUDIO_M3_PAD}{}
+            \opt{GIGABEAT_RC_PAD}{\ButtonRCRew}
+            &}
+        Exit PictureFlow
+            \\
+            
     \end{btnmap}
 \end{table}