37 files changed, 90 insertions, 99 deletions

diff --git a/manual/plugins/battery_test.tex b/manual/plugins/battery_test.tex
index 65f48e22ec..6d798f46e3 100644
--- a/manual/plugins/battery_test.tex
+++ b/manual/plugins/battery_test.tex
@@ -1,7 +1,7 @@
 \subsection{Battery\_test}
-\begin{figure}[h]
+\begin{figure}[h!]
 \begin{center}
-%\includegraphics{plugins/images/\platform/ss_battery_test.png}
+\includegraphics[width=4cm]{plugins/images/ss-battery_test-\genericimg.png}
 \end{center}
 \caption{Battery Test}
 \end{figure}
@@ -13,4 +13,3 @@ log file. The test stops when battery level reaches 4\% in order to
 avoid being unable to write to the disk.  The power usage data is saved
 to a file in the root directory of the Jukebox.  This plugin can
 sometimes be useful for diagnosing problems with battery charging.
-
diff --git a/manual/plugins/bounce.tex b/manual/plugins/bounce.tex
index 2b337df3c4..4b5758c5a9 100644
--- a/manual/plugins/bounce.tex
+++ b/manual/plugins/bounce.tex
@@ -1,7 +1,7 @@
 \subsection{Bounce}
 \begin{figure}[h]
 \begin{center}
-%\includegraphics{plugins/images/\platform/ss_bounce.png}
+\includegraphics[width=4cm]{plugins/images/ss-bounce-\genericimg.png}
 \end{center}
 \caption{Bounce}
 \end{figure}
@@ -33,4 +33,4 @@ respectively
 \item \textbf{Xadd/Yadd:} how fast the code moves on the sine curve on
 each axis
 \item \textbf{Xsane/Ysane:} Changes the appearance of the bouncing.
-\end{itemize}
+\end{itemize}
\ No newline at end of file
diff --git a/manual/plugins/chess_clock.tex b/manual/plugins/chess_clock.tex
index 3d5db4d9e9..d7b4cff6ec 100644
--- a/manual/plugins/chess_clock.tex
+++ b/manual/plugins/chess_clock.tex
@@ -1,7 +1,7 @@
 \subsection{Chess Clock}
-\begin{figure}[h]
+\begin{figure}[h!]
 \begin{center}
-%\includegraphics{plugins/images/\platform/ss_chessclock.png}
+\includegraphics{plugins/images/ss-chess_clock-\genericimg.png}
 \end{center}
 \caption{Chess Clock}
 \end{figure}
diff --git a/manual/plugins/flipit.tex b/manual/plugins/flipit.tex
index 022d7c11ec..b72b4f49d7 100644
--- a/manual/plugins/flipit.tex
+++ b/manual/plugins/flipit.tex
@@ -1,10 +1,10 @@
 \subsection{Flipit}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=3.353cm,height=2.154cm]{images/rockbox-manual-img36.png}
- \newline
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-flipit-\genericimg.png}
+\end{center}
+\end{figure}
 Flipit plugin
-\par}
 
 Flipping the colour of the token under the cursor also flips the tokens
 above, below, left and right of the cursor.  The aim is to end up with
@@ -22,6 +22,3 @@ F3 & Mode + On/off & Step by step \\\hline
 OFF & On/off & Stop the game \\\hline
 \end{tabular}
 \end{table}
- 
-
-
diff --git a/manual/plugins/images/ss-battery_test-160x128x2.png b/manual/plugins/images/ss-battery_test-160x128x2.png
new file mode 100644
index 0000000000..d0830ed6a7
--- /dev/null
+++ b/manual/plugins/images/ss-battery_test-160x128x2.png
diff --git a/manual/plugins/images/ss-bounce-160x128x2.png b/manual/plugins/images/ss-bounce-160x128x2.png
new file mode 100644
index 0000000000..16911b6406
--- /dev/null
+++ b/manual/plugins/images/ss-bounce-160x128x2.png
diff --git a/manual/plugins/images/ss-calculator-160x128x2.png b/manual/plugins/images/ss-calculator-160x128x2.png
new file mode 100644
index 0000000000..4ee09091fc
--- /dev/null
+++ b/manual/plugins/images/ss-calculator-160x128x2.png
diff --git a/manual/plugins/images/ss-chess_clock-160x128x2.png b/manual/plugins/images/ss-chess_clock-160x128x2.png
new file mode 100644
index 0000000000..0fdf780299
--- /dev/null
+++ b/manual/plugins/images/ss-chess_clock-160x128x2.png
diff --git a/manual/plugins/images/ss-flipit-160x128x2.png b/manual/plugins/images/ss-flipit-160x128x2.png
new file mode 100644
index 0000000000..b0c291e331
--- /dev/null
+++ b/manual/plugins/images/ss-flipit-160x128x2.png
diff --git a/manual/plugins/images/ss-mandelbrot-160x128x2.png b/manual/plugins/images/ss-mandelbrot-160x128x2.png
new file mode 100644
index 0000000000..07bc11f481
--- /dev/null
+++ b/manual/plugins/images/ss-mandelbrot-160x128x2.png
diff --git a/manual/plugins/images/ss-minesweeper-160x128x2.png b/manual/plugins/images/ss-minesweeper-160x128x2.png
new file mode 100644
index 0000000000..9453e183d7
--- /dev/null
+++ b/manual/plugins/images/ss-minesweeper-160x128x2.png
diff --git a/manual/plugins/images/ss-mosaic-160x128x2.png b/manual/plugins/images/ss-mosaic-160x128x2.png
new file mode 100644
index 0000000000..c00da1a5ed
--- /dev/null
+++ b/manual/plugins/images/ss-mosaic-160x128x2.png
diff --git a/manual/plugins/images/ss-oscillograph-160x128x2.png b/manual/plugins/images/ss-oscillograph-160x128x2.png
new file mode 100644
index 0000000000..ae8c8c2daf
--- /dev/null
+++ b/manual/plugins/images/ss-oscillograph-160x128x2.png
diff --git a/manual/plugins/images/ss-rockblox-160x128x2.png b/manual/plugins/images/ss-rockblox-160x128x2.png
new file mode 100644
index 0000000000..e3e6174ebd
--- /dev/null
+++ b/manual/plugins/images/ss-rockblox-160x128x2.png
diff --git a/manual/plugins/images/ss-sliding-160x128x2.png b/manual/plugins/images/ss-sliding-160x128x2.png
new file mode 100644
index 0000000000..ed448b7d82
--- /dev/null
+++ b/manual/plugins/images/ss-sliding-160x128x2.png
diff --git a/manual/plugins/images/ss-snake-160x128x2.png b/manual/plugins/images/ss-snake-160x128x2.png
new file mode 100644
index 0000000000..6c60c432b1
--- /dev/null
+++ b/manual/plugins/images/ss-snake-160x128x2.png
diff --git a/manual/plugins/images/ss-snake2-160x128x2.png b/manual/plugins/images/ss-snake2-160x128x2.png
new file mode 100644
index 0000000000..aa86d006a6
--- /dev/null
+++ b/manual/plugins/images/ss-snake2-160x128x2.png
diff --git a/manual/plugins/images/ss-snow-160x128x2.png b/manual/plugins/images/ss-snow-160x128x2.png
new file mode 100644
index 0000000000..48901e7371
--- /dev/null
+++ b/manual/plugins/images/ss-snow-160x128x2.png
diff --git a/manual/plugins/images/ss-sokoban-160x128x2.png b/manual/plugins/images/ss-sokoban-160x128x2.png
new file mode 100644
index 0000000000..eb994d74ea
--- /dev/null
+++ b/manual/plugins/images/ss-sokoban-160x128x2.png
diff --git a/manual/plugins/images/ss-solitaire-160x128x2.png b/manual/plugins/images/ss-solitaire-160x128x2.png
new file mode 100644
index 0000000000..47c268554d
--- /dev/null
+++ b/manual/plugins/images/ss-solitaire-160x128x2.png
diff --git a/manual/plugins/images/ss-star-160x128x2.png b/manual/plugins/images/ss-star-160x128x2.png
new file mode 100644
index 0000000000..8f39306036
--- /dev/null
+++ b/manual/plugins/images/ss-star-160x128x2.png
diff --git a/manual/plugins/images/ss-stopwatch-160x128x2.png b/manual/plugins/images/ss-stopwatch-160x128x2.png
new file mode 100644
index 0000000000..b6d45cb8e0
--- /dev/null
+++ b/manual/plugins/images/ss-stopwatch-160x128x2.png
diff --git a/manual/plugins/images/ss-vumeter-160x128x2.png b/manual/plugins/images/ss-vumeter-160x128x2.png
new file mode 100644
index 0000000000..7acec6eff0
--- /dev/null
+++ b/manual/plugins/images/ss-vumeter-160x128x2.png
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index 49adb01745..a3f661f0de 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -62,11 +62,11 @@ See also the Chip{}-8 emulator on page \pageref{ref:Chip8emulator}.
 
 \opt{recorder,recorderv2fm,ondio,h1xx,h300}{\input{plugins/mosaic.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/oscillograph.tex}}
+\opt{recorder,recorderv2fm,ondio,h1xx}{\input{plugins/oscillograph.tex}}
 
 \opt{recorder,recorderv2fm,ondio,h1xx,h300}{\input{plugins/snow.tex}}
 
-\opt{recorder,recorderv2fm,ondio}{\input{plugins/vumeter.tex}}
+\opt{recorder,recorderv2fm,ondio,h1xx}{\input{plugins/vumeter.tex}}
 
 \section{\label{ref:Viewersplugins}Viewers}
 
diff --git a/manual/plugins/mandelbrot.tex b/manual/plugins/mandelbrot.tex
index 34afb90600..b96d1d4994 100644
--- a/manual/plugins/mandelbrot.tex
+++ b/manual/plugins/mandelbrot.tex
@@ -1,10 +1,10 @@
 \subsection{Mandelbrot}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=3.865cm,height=2.21cm]{images/rockbox-manual-img52.png}
- \newline
-Mandelbrot
-\par}
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-mandelbrot-\genericimg.png}
+\end{center}
+\caption{Mandelbrot}
+\end{figure}
 
 This is another demonstration using the grayscale engine.  It draws fractal images from the Mandelbrot set.
 
@@ -22,4 +22,3 @@ F3 & Reset and return to the default image \\\hline
 \end{tabular}
 \end{center}
 \end{table}
-
diff --git a/manual/plugins/minesweeper.tex b/manual/plugins/minesweeper.tex
index 4db7ae62c6..c4042ca6b0 100644
--- a/manual/plugins/minesweeper.tex
+++ b/manual/plugins/minesweeper.tex
@@ -1,13 +1,11 @@
 \subsection{Minesweeper}
-{\centering\itshape
-Minesweeper plugin
-\par}
-
+\begin{figure}[h!]
 \begin{center}
- [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=2.963cm,height=1.693cm]{images/rockbox-manual-img38.png}
-
+\includegraphics[width=4cm]{plugins/images/ss-minesweeper-\genericimg.png}
 \end{center}
+\caption{Minesweeper plugin}
+\end{figure}
+
 The classic game of minesweeper.  Use the UP and DOWN keys to select the
 required percentage of mines to set the difficulty then press the MENU
 key to begin.
diff --git a/manual/plugins/mosaic.tex b/manual/plugins/mosaic.tex
index 4d945da85d..84ee27a356 100644
--- a/manual/plugins/mosaic.tex
+++ b/manual/plugins/mosaic.tex
@@ -1,12 +1,10 @@
 \subsection{Mosaic}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=3.706cm,height=2.117cm]{images/rockbox-manual-img53.png}
- \newline
-Mosaic
-\par}
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-mosaic-\genericimg.png}
+\end{center}
+\caption{Mosaic}
+\end{figure}
 
 This simple graphics demo draws a mosaic picture on the screen of the
 Jukebox.  Press STOP to quit.
-
-
diff --git a/manual/plugins/oscillograph.tex b/manual/plugins/oscillograph.tex
index 4dac88898b..e2e52f00f4 100644
--- a/manual/plugins/oscillograph.tex
+++ b/manual/plugins/oscillograph.tex
@@ -1,10 +1,10 @@
 \subsection{Oscillograph}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=3.6cm,height=2.057cm]{images/rockbox-manual-img54.png}
- \newline
-Oscillograph
-\par}
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-oscillograph-\genericimg.png}
+\end{center}
+\caption{Oscillograph}
+\end{figure}
 
 This demo shows the shape of the sound samples that make up the music
 being played.
diff --git a/manual/plugins/rockblox.tex b/manual/plugins/rockblox.tex
index 5baef7296b..04610f200f 100644
--- a/manual/plugins/rockblox.tex
+++ b/manual/plugins/rockblox.tex
@@ -1,10 +1,10 @@
 \subsection{Rockblox}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=3.949cm,height=2.23cm]{images/rockbox-manual-img41.png}
- \newline
-Rockblox plugin
-\par}
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-rockblox-\genericimg.png}
+\end{center}
+\caption{Rockblox plugin}
+\end{figure}
 
 This well{}-known game will probably be familiar. The aim of the game is
 to complete rows with the given pieces (blocks). Pieces can be rotated
@@ -26,4 +26,3 @@ OFF & Exit Rockblox\\\hline
 \end{tabular}
 \end{center}
 \end{table}
-
diff --git a/manual/plugins/sliding.tex b/manual/plugins/sliding.tex
index e39840baab..17bd48bf97 100644
--- a/manual/plugins/sliding.tex
+++ b/manual/plugins/sliding.tex
@@ -1,10 +1,10 @@
 \subsection{Sliding Puzzle}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=3.988cm,height=2.279cm]{images/rockbox-manual-img42.png}
- \newline
-Sliding puzzle
-\par}
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-sliding-\genericimg.png}
+\end{center}
+\caption{Sliding puzzle}
+\end{figure}
 
 The classic sliding puzzle game.  Rearrange the pieces so that you can
 see the whole picture.
@@ -23,5 +23,3 @@ OFF & Stop the game \\\hline
 \end{tabular}
 \end{center}
 \end{table}
-
-
diff --git a/manual/plugins/snake.tex b/manual/plugins/snake.tex
index dfe596b6f5..c43d588c5a 100644
--- a/manual/plugins/snake.tex
+++ b/manual/plugins/snake.tex
@@ -1,4 +1,11 @@
 \subsection{Snake}
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-snake-\genericimg.png}
+\end{center}
+\caption{Snake}
+\end{figure}
+
 This is the popular snake game. The aim is to grow your snake as large
 as possible by eating the dots that appear on the screen. The game will
 end when the snake touches either the borders of the screen or itself.
diff --git a/manual/plugins/snake2.tex b/manual/plugins/snake2.tex
index 093cada648..1fd626a474 100644
--- a/manual/plugins/snake2.tex
+++ b/manual/plugins/snake2.tex
@@ -1,10 +1,10 @@
-\subsection{ Snake 2}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=3.96cm,height=2.23cm]{images/rockbox-manual-img43.png}
- \newline
-Snake 2 {--} The Snake Strikes Back
-\par}
+\subsection{Snake 2}
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-snake2-\genericimg.png}
+\end{center}
+\caption{Snake 2 {--} The Snake Strikes Back}
+\end{figure}
 
 Another version of the Snake game. Move the snake around, and eat the
 apples that pop up on the screen. Each time an apple is eaten, the
diff --git a/manual/plugins/sokoban.tex b/manual/plugins/sokoban.tex
index 76a6eed2fa..fec06edba1 100644
--- a/manual/plugins/sokoban.tex
+++ b/manual/plugins/sokoban.tex
@@ -1,10 +1,10 @@
 \subsection{Sokoban}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=4.15cm,height=2.35cm]{images/rockbox-manual-img44.png}
- \newline
-Sokoban
-\par}
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-sokoban-\genericimg.png}
+\end{center}
+\caption{Sokoban}
+\end{figure}
 
 The object of the game is to push boxes into their correct position in a
 crowded warehouse with a minimal number of pushes and moves. The boxes
diff --git a/manual/plugins/solitaire.tex b/manual/plugins/solitaire.tex
index 7002e69222..0a180b776c 100644
--- a/manual/plugins/solitaire.tex
+++ b/manual/plugins/solitaire.tex
@@ -1,10 +1,10 @@
 \subsection{Solitaire}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=3.96cm,height=2.251cm]{images/rockbox-manual-img45.png}
- \newline
-Klondike solitaire
-\par}
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-solitaire-\genericimg.png}
+\end{center}
+\caption{Klondike solitaire}
+\end{figure}
 
 This is the classic Klondike solitaire game
 for Rockbox.  Select \textbf{help }from the game menu to get an
diff --git a/manual/plugins/star.tex b/manual/plugins/star.tex
index f811043858..e113490255 100644
--- a/manual/plugins/star.tex
+++ b/manual/plugins/star.tex
@@ -1,10 +1,10 @@
 \subsection{Star}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=3.865cm,height=2.208cm]{images/rockbox-manual-img46.png}
- \newline
-Star game
-\par}
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-star-\genericimg.png}
+\end{center}
+\caption{Star game}
+\end{figure}
 
 This is a puzzle game.  It is actually a rewrite of Star, a game written
 by CDK designed for the hp48 calculator.
diff --git a/manual/plugins/stopwatch.tex b/manual/plugins/stopwatch.tex
index 7ce9c541b3..3d0ca8e80d 100644
--- a/manual/plugins/stopwatch.tex
+++ b/manual/plugins/stopwatch.tex
@@ -1,13 +1,10 @@
 \subsection{Stopwatch}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=3.704cm,height=2.117cm]{images/rockbox-manual-img73.png}
- \textmd{  }  [Warning: Image ignored]
-% Unhandled or unsupported graphics:
-%\includegraphics[width=4.667cm,height=1.998cm]{images/rockbox-manual-img74.png}
- \newline
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-stopwatch-\genericimg.png}
+\end{center}
+\end{figure}
 Recorder stopwatch  Player stopwatch  
-\par}
 
 A simple stopwatch program with support for saving times.
 
diff --git a/manual/plugins/vumeter.tex b/manual/plugins/vumeter.tex
index bf38e18711..3ba49c2eb4 100644
--- a/manual/plugins/vumeter.tex
+++ b/manual/plugins/vumeter.tex
@@ -1,10 +1,9 @@
 \subsection{VU meter}
-{\centering\itshape
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=4.304cm,height=2.459cm]{images/rockbox-manual-img56.png}
- \newline
-VU meter
-\par}
+\begin{figure}[h!]
+\begin{center}
+\includegraphics[width=4cm]{plugins/images/ss-vumeter-\genericimg.png}
+\end{center}
+\end{figure}
 
 This is a VU meter, which displays the volume of the left and right
 audio channels. There are 3 types of meter selectable.  The analogue