diff --git a/manual/plugins/images/ss-solitaire-160x128x16.png b/manual/plugins/images/ss-solitaire-160x128x16.png
new file mode 100644
index 0000000000..a8a8689291
Binary files /dev/null and b/manual/plugins/images/ss-solitaire-160x128x16.png differ
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 6cc23f1241..f27e6b8293 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -24,7 +24,7 @@ will carry on playing whilst plugins are being run.
 
 \opt{HAVE_LCD_BITMAP}{\input{plugins/brickmania.tex}}
 
-\opt{recorder,recorderv2fm,ondio,h1xx,h300,IPOD_4G_PAD,x5}{\input{plugins/bubbles.tex}}
+\opt{HAVE_LCD_BITMAP}{\input{plugins/bubbles.tex}}
 
 \opt{recorder,recorderv2fm,ondio,h1xx,h300,IPOD_4G_PAD}{\input{plugins/chessbox.tex}}
 
@@ -54,7 +54,7 @@ will carry on playing whilst plugins are being run.
 
 \opt{recorder,recorderv2fm,ondio,h1xx,h300,IPOD_4G_PAD}{\input{plugins/sokoban.tex}}
 
-\opt{recorder,recorderv2fm,ondio,h1xx,h300,IPOD_4G_PAD}{\input{plugins/solitaire.tex}}
+\opt{HAVE_LCD_BITMAP}{\input{plugins/solitaire.tex}}
 
 \opt{HAVE_LCD_BITMAP}{\input{plugins/spacerocks.tex}}
 
@@ -131,7 +131,7 @@ the associated file.  Viewers are stored in the
 
 \opt{HAVE_LCD_BITMAP}{\input{plugins/calculator.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/calendar.tex}}
+\opt{recorder,recorderv2fm}{\input{plugins/calendar.tex}}
 
 {\input{plugins/chess_clock.tex}}
 
@@ -139,7 +139,7 @@ the associated file.  Viewers are stored in the
 
 {\input{plugins/dice.tex}}
 
-\opt{recorder,recorderv2fm}{\input{plugins/euro_converter.tex}}
+\opt{player}{\input{plugins/euro_converter.tex}}
 
 {\input{plugins/favorites.tex}}
 
@@ -153,4 +153,4 @@ the associated file.  Viewers are stored in the
 
 {\input{plugins/stopwatch.tex}}
 
-\opt{recorder,recorderv2fm,ondio,h1xx,h300,ipodcolor}{\input{plugins/text_editor.tex}}
+\opt{HAVE_LCD_BITMAP}{\input{plugins/text_editor.tex}}
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index bc49642826..41ca0946fc 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -15,40 +15,43 @@ visit\\
 
 \begin{table}
   \begin{btnmap}{}{}
-    \opt{RECORDER_PAD,ONDIO_PAD,h1xx,h300,x5}
-      {\ButtonLeft, \ButtonRight, \ButtonUp\ and \ButtonDown}
-    \opt{IPOD_4G_PAD}{\fixme{tbd}}
-    & Move Cursor around.\\
+    \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}
+      & Move Cursor around.\\
     %
     \opt{RECORDER_PAD}{\ButtonOn}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonSelect}
-    \opt{AUDIO_X5_PAD,IPOD_4G_PAD}{\fixme{TBD}}
-    \opt{ONDIO_PAD}{\ButtonMenu} %
+    \opt{ONDIO_PAD}{\ButtonMenu}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_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{AUDIO_X5_PAD,IPOD_4G_PAD}{\fixme{TBD}}
-    \opt{ONDIO_PAD}{Hold \ButtonMenu} %
+    \opt{IPOD_4G_PAD}{\ButtonSelect + \ButtonPlay}
+    \opt{IAUDIO_X5_PAD}{\ButtonPlay}
+    \opt{ONDIO_PAD}{Hold \ButtonMenu}
       & If a card was selected -- unselect it, else\\
       & Draw 3 new cards from the remains stack\\
     %
     \opt{RECORDER_PAD}{\ButtonPlay}
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn + \ButtonLeft}
-    \opt{AUDIO_X5_PAD,IPOD_4G_PAD}{\fixme{TBD}}
-    \opt{ONDIO_PAD}{Hold \ButtonLeft} %
+    \opt{IPOD_4G_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{AUDIO_X5_PAD,IPOD_4G_PAD}{\fixme{TBD}}
-    \opt{ONDIO_PAD}{Hold \ButtonRight} %
+    \opt{IPOD_4G_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{AUDIO_X5_PAD,IPOD_4G_PAD}{\fixme{TBD}}
-    \opt{ONDIO_PAD}{Hold \ButtonUp} %
+    \opt{IPOD_4G_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.\\
   \end{btnmap}
  \end{table}
diff --git a/manual/plugins/text_editor.tex b/manual/plugins/text_editor.tex
index 2a9ed0b4cb..499ec79d97 100644
--- a/manual/plugins/text_editor.tex
+++ b/manual/plugins/text_editor.tex
@@ -30,9 +30,8 @@ the virtual keyboard.
     \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}\opt{IPOD_4G_PAD}{\ButtonMenu}
     \opt{IAUDIO_X5_PAD}{\ButtonPlay} 
     & Show Item Menu / Accept Line\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-    \opt{IPOD_4G_PAD}{\ButtonLeft}
-    & Delete Line / Delete Character\\
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec & Delete Line / Delete Character\\}
+    \opt{IPOD_4G_PAD}{\ButtonLeft & Delete Line / Delete Character\\}
     \end{btnmap}
 \end{table}