22 files changed, 73 insertions, 42 deletions

diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex
index 5b9c37e93e..5e24b7f370 100644
--- a/manual/advanced_topics/main.tex
+++ b/manual/advanced_topics/main.tex
@@ -402,6 +402,7 @@ You just ``play'' a file with the extension %
 \opt{iriver}{\fname{.iriver}.} %
 \opt{ipod}{\fname{.ipod}.} %
 \opt{iaudio}{\fname{.iaudio}.} %
+\opt{sansa}{\fname{.e200}.} %
 This can be used to test new firmware versions without deleting your
 current version.
 
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index 0a04ffd490..ec5522885b 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -15,11 +15,11 @@
 \includegraphics[width=0.37cm]{appendix/images/icon-wav-file.png} 
   & Wave Audio File & \fname{.wav} & Play a WAV file \\%
 \includegraphics[width=0.37cm]{appendix/images/icon-playlist.png} 
-  & Playlist & \fname{.m3u} & Rockbox loads the playlist and starts playing 
+  & Playlist & \fname{.m3u,.m3u8} & Rockbox loads the playlist and starts playing 
     the first file \\
 \includegraphics[width=0.37cm]{appendix/images/icon-rolo.png} 
   & Rockbox firmware & 
-    \opt{player}{\fname{.mod}}\opt{recorder,recorderv2fm,ondiofm,ondiosp}{\fname{.ajz}}\opt{iriver}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}
+    \opt{player}{\fname{.mod}}\opt{recorder,recorderv2fm,ondiofm,ondiosp}{\fname{.ajz}}\opt{iriver}{\fname{.iriver}}\opt{ipod}{\fname{.ipod}}\opt{sansa}{\fname{.e200}}
   & ROLO will load the new firmware \\
 \includegraphics[width=0.37cm]{appendix/images/icon-wps.png} 
   & While Playing Screen & \fname{.wps} & The new WPS display configuration will be loaded \\
diff --git a/manual/configure_rockbox/images/ss-equalizer-176x220x16.png b/manual/configure_rockbox/images/ss-equalizer-176x220x16.png
new file mode 100644
index 0000000000..75d07aebf8
--- /dev/null
+++ b/manual/configure_rockbox/images/ss-equalizer-176x220x16.png
diff --git a/manual/configure_rockbox/images/ss-general-settings-176x220x16.png b/manual/configure_rockbox/images/ss-general-settings-176x220x16.png
new file mode 100644
index 0000000000..23a85c3e3c
--- /dev/null
+++ b/manual/configure_rockbox/images/ss-general-settings-176x220x16.png
diff --git a/manual/configure_rockbox/images/ss-sound-settings-176x220x16.png b/manual/configure_rockbox/images/ss-sound-settings-176x220x16.png
new file mode 100644
index 0000000000..dd284110b0
--- /dev/null
+++ b/manual/configure_rockbox/images/ss-sound-settings-176x220x16.png
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index 828bdacd5a..70c7cf6140 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -22,7 +22,7 @@ change to customise your listening experience.
   \opt{ipodnano}{minimum of -72 dB to a maximum of +6 dB.}
   \opt{ipodvideo}{minimum of -57 dB to a maximum of +6 dB.}
   \opt{ipodcolor,x5}{minimum of -\fixme{??} dB to a maximum of +\fixme{??} dB.}
-  \opt{h10,h10_5gb}{minimum of -74 dB to a maximum of +6 db.}
+  \opt{h10,h10_5gb,sansa}{minimum of -74 dB to a maximum of +6 db.}
   
 \section{Bass}
   \opt{player,recorder,recorderv2fm,ondio}{This emphasises or suppresses the 
@@ -35,7 +35,7 @@ change to customise your listening experience.
   \opt{ipodnano,ipodcolor,ipodvideo}{This emphasises or suppresses the
   lower (bass) sounds in the track. 0dB means that bass in unaltered
   (flat response). The minimum setting is -6dB and the maximum is 9dB.}
-  \opt{x5}{\fixme{add platform specific information here}}
+  \opt{x5,sansa}{\fixme{add platform specific information here}}
 
 \section{Treble}
   \opt{player,recorder,recorderv2fm,ondio}{This emphasises or suppresses the
@@ -48,7 +48,7 @@ change to customise your listening experience.
   \opt{ipodnano,ipodcolor,ipodvideo}{This setting emphasises or suppresses
   the higher (treble) sounds in the track. 0dB means that treble is unaltered
   (flat response). The minimum setting -6dB and the maximum is 9dB.}
-  \opt{x5}{\fixme{add platform specific information here}}
+  \opt{x5,sansa}{\fixme{add platform specific information here}}
 
 \section{Balance}
   This setting controls the balance between the left and right channels.  The 
@@ -316,27 +316,32 @@ 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}
       & 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}
       & Lowers the highlighted parameter.\\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonLeft}
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonLeft} 
+      \opt{SANSA_E200_PAD}{\ButtonUp}
       & Moves to the previous EQ band. \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRight}
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonRight} 
+      \opt{SANSA_E200_PAD}{\ButtonDown}
       & Moves to the next EQ band. \\
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
-      \opt{IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonSelect} 
+      \opt{IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD,SANSA_E200_PAD}{\ButtonSelect} 
       & Toggles the cursor among the three parameters (gain, center frequency, 
       Q) for the selected EQ band.\\  
       %
       \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
       \opt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_VIDEO_PAD}{\ButtonMenu} 
+      \opt{SANSA_E200_PAD}{\ButtonPower/\ButtonRight}
       & Exits the graphic EQ screen.\\  
     \end{btnmap}
   \end{table}
diff --git a/manual/main_menu/images/ss-list-bookmarks-176x220x16.png b/manual/main_menu/images/ss-list-bookmarks-176x220x16.png
new file mode 100644
index 0000000000..c7401e9e90
--- /dev/null
+++ b/manual/main_menu/images/ss-list-bookmarks-176x220x16.png
diff --git a/manual/main_menu/images/ss-main-menu-176x220x16.png b/manual/main_menu/images/ss-main-menu-176x220x16.png
new file mode 100644
index 0000000000..493dac4c18
--- /dev/null
+++ b/manual/main_menu/images/ss-main-menu-176x220x16.png
diff --git a/manual/plugins/calculator.tex b/manual/plugins/calculator.tex
index 1113bd96b7..11f305bed1 100644
--- a/manual/plugins/calculator.tex
+++ b/manual/plugins/calculator.tex
@@ -8,19 +8,19 @@ available maths functions on the right hand side.
 
 \begin{table}
 \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
         {Direction keys}
     \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,IPOD_3G_PAD,IAUDIO_X5_PAD}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
         {\ButtonSelect}
     & Press a button on the keypad\\
     \opt{RECORDER_PAD}{\ButtonFOne & Delete last entered digit or clear after
         calculation\\}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec & Delete
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonRec & Delete
         last entered digit or clear after calculation\\}
     %
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -28,10 +28,11 @@ available maths functions on the right hand side.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Hold \ButtonPlay}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{SANSA_E200_PAD}{\ButtonSelect}
     & Calculate\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonPower}
     & Quit\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index d0e566e44d..61e80c3ca7 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -7,7 +7,7 @@ used in any kind of game with up to ten players.
 \subsubsection{Setup}
 \begin{table}
   \begin{btnmap}{}{}
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
       {\ButtonRight/\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp/\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack/\ButtonScrollFwd}
@@ -15,12 +15,13 @@ used in any kind of game with up to ten players.
     \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{ONDIO_PAD}{\ButtonRight}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonSelect}
       & Move to next screen\\
     \opt{PLAYER_PAD}{\ButtonStop}
     \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}
+    \opt{SANSA_E200_PAD}{\ButtonPower}
       & Move to previous screen\\
   \end{btnmap}
 \end{table}
@@ -48,23 +49,25 @@ Keys are as follows:
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
     \opt{IAUDIO_X5_PAD}{\ButtonRec}
+    \opt{SANSA_E200_PAD}{\ButtonPower}
       & Exit plugin \\
     \opt{PLAYER_PAD}{\ButtonStop}
     \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}
+    \opt{SANSA_E200_PAD}{\ButtonDown}
       & 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,IPOD_3G_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{\ButtonSelect}
       & Pause the time (press again to continue) \\
-    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+    \opt{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
       {\ButtonRight}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp}
     \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{PLAYER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonLeft}
     \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
       & Switch to previous player \\
@@ -72,11 +75,12 @@ Keys are as follows:
     \opt{RECORDER_PAD}{\ButtonFOne}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
     \opt{IAUDIO_X5_PAD}{\ButtonSelect}
+    \opt{SANSA_E200_PAD}{\ButtonUp}
       & Open menu
       \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,IPOD_3G_PAD}{(\ButtonSelect\ to select.)}
+      \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}{(\ButtonSelect\ to select.)}
       \opt{IAUDIO_X5_PAD}{(press again to select.)}\\
   \end{btnmap}
 \end{table}
diff --git a/manual/plugins/chip8emulator.tex b/manual/plugins/chip8emulator.tex
index 7f927effaf..f21d219a28 100644
--- a/manual/plugins/chip8emulator.tex
+++ b/manual/plugins/chip8emulator.tex
@@ -39,14 +39,15 @@ The default keymappings are:
         \begin{sideways}
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
         \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-        \opt{IAUDIO_X5_PAD}{\ButtonPower}
+        \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonPower}
         \end{sideways} 
         &
         % Key "0"
         &
         % "Key "1"
         \begin{sideways}
-        \opt{RECORDER_PAD}{\ButtonFOne}\opt{ONDIO_PAD}{\ButtonUp}
+        \opt{RECORDER_PAD}{\ButtonFOne}
+        \opt{ONDIO_PAD}{\ButtonUp}
         \end{sideways}
         &
         % Key "2"
@@ -54,6 +55,7 @@ The default keymappings are:
         \opt{RECORDER_PAD,ONDIO_PAD}{\ButtonUp}
         \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
         \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonUp}
+        \opt{SANSA_E200_PAD}{\ButtonScrollDown}
         \end{sideways}
         &
         % Key "3"
@@ -63,19 +65,20 @@ The default keymappings are:
         % Key "4"
         \begin{sideways}
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonLeft}
-        \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonLeft}
+        \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonLeft}
         \end{sideways}
         &
         % Key "5"
         \begin{sideways}
-        \opt{RECORDER_PAD}{\ButtonPlay}\opt{ONDIO_PAD}{\ButtonMenu}
-        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
+        \opt{RECORDER_PAD}{\ButtonPlay}
+        \opt{ONDIO_PAD}{\ButtonMenu}
+        \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonSelect}
         \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay}
         \end{sideways}
         &
         % Key "6"
         \begin{sideways}
-        \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRight}
+        \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD}{\ButtonRight}
         \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonRight}
         \end{sideways}
         &
@@ -89,6 +92,7 @@ The default keymappings are:
         \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonDown}
         \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
         \opt{IAUDIO_X5_PAD}{\ButtonDown}
+        \opt{SANSA_E200_PAD}{\ButtonScrollDown}
         \end{sideways}
         &
         % Key "9"
diff --git a/manual/plugins/clock.tex b/manual/plugins/clock.tex
index 79d51102d8..06a40772e1 100644
--- a/manual/plugins/clock.tex
+++ b/manual/plugins/clock.tex
@@ -9,16 +9,18 @@ This is a fully featured analogue and digital clock plugin.
 \begin{btnmap}{}{}
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{SANSA_E200_PAD}{\ButtonUp}
     & Start / Stop Counter \\
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{SANSA_E200_PAD}{\ButtonUp}
     (Hold) & Reset Counter \\
     \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H300_PAD}{\ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H300_PAD,SANSA_E200_PAD}{\ButtonSelect}
     & Main Menu \\
     \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonPower}
     & Save Settings (if enabled) and Exit \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/dice.tex b/manual/plugins/dice.tex
index 40d648a863..4c9545976d 100644
--- a/manual/plugins/dice.tex
+++ b/manual/plugins/dice.tex
@@ -11,17 +11,19 @@ dice.
     \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}
         & 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,IPOD_4G_PAD}{\ButtonSelect}
+    \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,IPOD_4G_PAD,SANSA_E200_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,IPOD_3G_PAD}{Long press on \ButtonPlay}
-    \opt{IAUDIO_x5_PAD}{\ButtonPower}
+    \opt{IAUDIO_x5_PAD,SANSA_E200_PAD}{\ButtonPower}
         & Quit\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/disktidy.tex b/manual/plugins/disktidy.tex
index 93ea7ea8df..929628f0f4 100644
--- a/manual/plugins/disktidy.tex
+++ b/manual/plugins/disktidy.tex
@@ -17,14 +17,14 @@
       \ButtonLeft\ / \ButtonRight & Select option\\
       \opt{RECORDER_PAD}{\ButtonOn}%
       \opt{ONDIO_PAD}{\ButtonMenu}%
-      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD}
+      \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD}
         {\ButtonSelect}%
       \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay}%
       & Clean Up\\
       \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
         {\ButtonOff}%
       \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}%
-      \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPower}%
+      \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD}{\ButtonPower}%
       & Exit\ /\ Abort\\
     \end{btnmap}
 \end{table}
diff --git a/manual/plugins/jpegviewer.tex b/manual/plugins/jpegviewer.tex
index 4fe908c7c1..72ae0716a5 100644
--- a/manual/plugins/jpegviewer.tex
+++ b/manual/plugins/jpegviewer.tex
@@ -13,7 +13,7 @@ view a bigger file you may need to stop playback.}
 }
 \begin{table}
 \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
         {\ButtonUp\ / \ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu\ / \ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
@@ -21,7 +21,7 @@ view a bigger file you may need to stop playback.}
     & 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{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollFwd}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}
     & Zoom in\\
@@ -29,7 +29,7 @@ view a bigger file you may need to stop playback.}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonScrollBack}
-    \opt{IAUDIO_X5_PAD}{Long \ButtonSelect}
+    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{Long \ButtonSelect}
     \opt{IRIVER_H10_PAD}{Long \ButtonPlay}
     & Zoom out\\
     \opt{RECORDER_PAD}{\ButtonFThree}
@@ -39,6 +39,7 @@ view a bigger file you may need to stop playback.}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonFF}
+    \opt{SANSA_E200_PAD}{\ButtonScrollDown}
     & Next jpeg in folder\\
     \opt{RECORDER_PAD}{\ButtonFTwo}
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonLeft}
@@ -46,10 +47,12 @@ view a bigger file you may need to stop playback.}
     \opt{IRIVER_H300_PAD}{\ButtonOn}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
     \opt{IRIVER_H10_PAD}{\ButtonRew}
+    \opt{SANSA_E200_PAD}{\ButtonScrollUp}
     & Previous jpeg in folder\\
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
     \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPower}
+    \opt{SANSA_E200_PAD}{\ButtonRec}
     & Show menu\\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index 1bb2477b3a..0e3f0623ba 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -9,25 +9,30 @@ A simple stopwatch program with support for saving times.
 \opt{recorder,recorderv2fm,h1xx,h300}{\ButtonOff}
 \opt{ondio}{\ButtonOff}
 \opt{ipodcolor,ipodnano}{\ButtonMenu}
+\opt{SANSA_E200_PAD}{\ButtonPower}
 & Quit Plugin \\
 \opt{player,recorder,recorderv2fm}{\ButtonPlay}
 \opt{ondio}{\ButtonRight}
 \opt{h1xx,h300}{\ButtonSelect}
 \opt{ipodcolor,ipodnano}{\ButtonPlay}
+\opt{SANSA_E200_PAD}{\ButtonLeft}
 & Start / stop \\
 \opt{player}{\ButtonStop}
 \opt{recorder,recorderv2fm,ondio}{\ButtonLeft}
 \opt{h1xx,h300}{\ButtonDown}
 \opt{ipodcolor,ipodnano}{\fixme{Unknown}} 
+\opt{SANSA_E200_PAD}{\ButtonRec}
 & Reset timer (only when timer is stopped)\\
 \opt{player,recorder,recorderv2fm}{\ButtonOn}
 \opt{ondio}{\ButtonMenu}
 \opt{h1xx,h300}{\ButtonOn}
 \opt{ipodcolor,ipodnano}{\fixme{Unknown}} 
+\opt{SANSA_E200_PAD}{\ButtonSelect}
 & Take lap time \\
 \opt{player,h1xx,h300,ipodcolor,ipodnano}{\ButtonLeft/\ButtonRight}
 \opt{recorder,recorderv2fm}{\ButtonDown/\ButtonUp}
 \opt{ondio}{\ButtonUp/\ButtonDown}
+\opt{SANSA_E200_PAD}{\ButtonScrollUp/\ButtonScrollDown}
 & Scroll through lap times \\
 \end{btnmap}
 \end{table}
diff --git a/manual/plugins/text_viewer.tex b/manual/plugins/text_viewer.tex
index 47a39075cc..e8f16fca65 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,IPOD_3G_PAD}{
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_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,IPOD_3G_PAD}{
+\opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_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{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonUp}
     \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{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonDown}
     \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,IPOD_3G_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,SANSA_E200_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,IPOD_3G_PAD,IAUDIO_X5_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD}
         {\ButtonRight} 
     & Bottom of file (Narrow mode) One screen right (Wide mode)\\
         
@@ -81,7 +81,9 @@ 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,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}\opt{IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonLeft}
+    \opt{IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{SANSA_E200_PAD}{n/a}
         & Toggles Word mode\\
         
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonMenu+\ButtonRight}
@@ -90,6 +92,7 @@ If file fits on one screen, there is no scrollbar and toggling Scrollbar mode ha
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonPlay}
     \opt{IAUDIO_X5_PAD}{Long press on \ButtonPlay}
+    \opt{SANSA_E200_PAD}{n/a}
         & Cycles line mode\\
         
     \opt{PLAYER_PAD}{\ButtonOn+\ButtonRight}
@@ -97,6 +100,7 @@ If file fits on one screen, there is no scrollbar and toggling Scrollbar mode ha
     \opt{ONDIO_PAD}{\ButtonMenu+\ButtonRight}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonSelect}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonRight}
+    \opt{SANSA_E200_PAD}{n/a}
         & Toggles view mode\\
         
     \opt{RECORDER_PAD}{\ButtonOn+\ButtonFOne & Toggles page mode\\}
@@ -116,7 +120,7 @@ If file fits on one screen, there is no scrollbar and toggling Scrollbar mode ha
     \opt{PLAYER_PAD}{\ButtonStop}
     \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD}{\ButtonPower}
+    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD}{\ButtonPower}
         & Exit text viewer\\
     \end{btnmap}
 \end{table}
diff --git a/manual/rockbox_interface/images/ss-file-browser-176x220x16.png b/manual/rockbox_interface/images/ss-file-browser-176x220x16.png
new file mode 100644
index 0000000000..ad81e084cd
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-file-browser-176x220x16.png
diff --git a/manual/rockbox_interface/images/ss-file-menu-176x220x16.png b/manual/rockbox_interface/images/ss-file-menu-176x220x16.png
new file mode 100644
index 0000000000..e19f062dcf
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-file-menu-176x220x16.png
diff --git a/manual/rockbox_interface/images/ss-id3-viewer-176x220x16.png b/manual/rockbox_interface/images/ss-id3-viewer-176x220x16.png
new file mode 100644
index 0000000000..d68131b82b
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-id3-viewer-176x220x16.png
diff --git a/manual/rockbox_interface/images/ss-playlist-menu-176x220x16.png b/manual/rockbox_interface/images/ss-playlist-menu-176x220x16.png
new file mode 100644
index 0000000000..8116d463fa
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-playlist-menu-176x220x16.png
diff --git a/manual/rockbox_interface/images/ss-virtual-keyboard-176x220x16.png b/manual/rockbox_interface/images/ss-virtual-keyboard-176x220x16.png
new file mode 100644
index 0000000000..8e3ccd7d3a
--- /dev/null
+++ b/manual/rockbox_interface/images/ss-virtual-keyboard-176x220x16.png