diff --git a/manual/getting_started/archos_choice.tex b/manual/getting_started/archos_choice.tex
index 1c3944455b..4ff2bac3bd 100644
--- a/manual/getting_started/archos_choice.tex
+++ b/manual/getting_started/archos_choice.tex
@@ -9,131 +9,28 @@ the software you need.
 The model name is printed on the case.  The hard drive size is listed on
 the serial number sticker on the back of the unit.
 
-\begin{minipage}{16.589cm}
-\begin{center}\begin{tabular}{|p{1.846cm}|p{5.6280003cm}|p{6.053cm}|p{2.195cm}|}
-\hline
-{\centering\bfseries\itshape
-\label{ref:Jukeboxtypetable}Picture
-\par}
-&
-{\centering\bfseries\itshape
-DISK size
-\par}
-&
-{\centering\bfseries\itshape
-Model Name 
-\par}
-&
-{\centering\bfseries\itshape
-Version Name
-\par}
-\\\hline
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=2.117cm,height=2.858cm]{images/rockbox-manual-img2.jpg}
- 
-&
-{\centering
-5GB, 6GB, 10GB, 20GB
-\par}
-&
-{\centering
-Jukebox 5000,\newline
-Jukebox 6000,\newline
-Jukebox Studio 10,\newline
-Jukebox Studio 20
-\par}
-&
-{\centering
-player 
-\par}
-\\\hline
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=2.117cm,height=2.822cm]{images/rockbox-manual-img3.jpg}
- 
-&
-{\centering
-6GB, 10GB, 15GB, 20GB
-\par}
-&
-{\centering
-Jukebox Recorder 6,\newline
-Jukebox Recorder 10,\newline
-Jukebox Recorder 15,\newline
-Jukebox Recorder 20
-\par}
-&
-{\centering
-recorder 
-\par}
-\\\hline
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=2.117cm,height=2.893cm]{images/rockbox-manual-img4.jpg}
- 
-&
-{\centering
-20GB
-\par}
-&
-{\centering
-Jukebox Recorder v2
-\par}
-&
-{\centering
-recorderv2 
-\par}
-\\\hline
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=2.117cm,height=2.893cm]{images/rockbox-manual-img5.jpg}
- 
-&
-{\centering
-20GB
-\par}
-&
-{\centering
-Jukebox Recorder FM
-\par}
-&
-{\centering
-fmrecorder 
-\par}
-\\\hline
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=2.12cm,height=2.889cm]{images/rockbox-manual-img6.jpg}
- 
-&
-{\centering
-128MB\newline
-(flash)
-\par}
-&
-{\centering
-Ondio 128 SP
-\par}
-&
-{\centering
-ondiosp
-\par}
-\\\hline
-  [Warning: Image ignored] % Unhandled or unsupported graphics:
-%\includegraphics[width=2.117cm,height=2.893cm]{images/rockbox-manual-img7.jpg}
- 
-&
-{\centering
-128MB\newline
-(flash)
-\par}
-&
-{\centering
-Ondio 128 FM
-\par}
-&
-{\centering
-ondiofm
-\par}
-\\\hline
-\end{tabular}\end{center}
-\end{minipage}Please note that Rockbox does not run on the Archos
+\begin{center}
+  \begin{tabular}{@{}cccc@{}}\toprule
+    \label{ref:Jukeboxtypetable}
+    \textbf{Picture} & \textbf{Disk size} & \textbf{Model Name} & \textbf{Version Name} \\\midrule
+    \includegraphics[width=2cm]{getting_started/images/archos-studio-small.png} & 5GB, 6GB, 10GB, 20GB & Jukebox 5000, & player\\
+    & & Jukebox 6000, & \\
+    & & Jukebox Studio 10, & \\
+    & & Jukebox Studio 20 & \\\midrule
+    \includegraphics[width=2cm]{getting_started/images/archos-recorder-small.png} & 6GB, 10GB, 15GB, 20GB & Jukebox Recorder 6, & recorder\\
+    & & Jukebox Recorder 10, & \\
+    & & Jukebox Recorder 15, & \\
+    & & Jukebox Recorder 20 & \\\midrule
+    \includegraphics[width=2cm]{getting_started/images/archos-recorderv2-small.png}
+    & 20GB & Jukebox Recorder v2 & recorderv2\\\midrule
+    \includegraphics[width=2cm]{getting_started/images/archos-recorderfm-small.png}
+    & 20GB & Jukebox Recorder FM & fmrecorder \\\midrule
+    \includegraphics[width=2cm]{getting_started/images/archos-ondiosp-small.png}
+    & 128MB (flash) & Ondio 128 SP & ondiosp \\\midrule
+    \includegraphics[width=2cm]{getting_started/images/archos-ondiofm-small.png}
+    &128MB (flash) & Ondio 128 FM & ondiofm \\\bottomrule
+  \end{tabular}
+\end{center}
+Please note that Rockbox does not run on the Archos
 Jukebox Multimedia or any Archos MP3 player products other than those
 mentioned here.
-
diff --git a/manual/getting_started/images/archos-ondiofm-small.png b/manual/getting_started/images/archos-ondiofm-small.png
new file mode 100644
index 0000000000..bc31ea8661
Binary files /dev/null and b/manual/getting_started/images/archos-ondiofm-small.png differ
diff --git a/manual/getting_started/images/archos-ondiosp-small.png b/manual/getting_started/images/archos-ondiosp-small.png
new file mode 100644
index 0000000000..3722ce808e
Binary files /dev/null and b/manual/getting_started/images/archos-ondiosp-small.png differ
diff --git a/manual/getting_started/images/archos-recorder-small.png b/manual/getting_started/images/archos-recorder-small.png
new file mode 100644
index 0000000000..2885412c25
Binary files /dev/null and b/manual/getting_started/images/archos-recorder-small.png differ
diff --git a/manual/getting_started/images/archos-recorderfm-small.png b/manual/getting_started/images/archos-recorderfm-small.png
new file mode 100644
index 0000000000..8329e31583
Binary files /dev/null and b/manual/getting_started/images/archos-recorderfm-small.png differ
diff --git a/manual/getting_started/images/archos-recorderv2-small.png b/manual/getting_started/images/archos-recorderv2-small.png
new file mode 100644
index 0000000000..8329e31583
Binary files /dev/null and b/manual/getting_started/images/archos-recorderv2-small.png differ
diff --git a/manual/getting_started/images/archos-studio-small.png b/manual/getting_started/images/archos-studio-small.png
new file mode 100644
index 0000000000..dc424c8b6d
Binary files /dev/null and b/manual/getting_started/images/archos-studio-small.png differ
diff --git a/manual/getting_started/main.tex b/manual/getting_started/main.tex
index b6d43dfc30..8285f20bff 100644
--- a/manual/getting_started/main.tex
+++ b/manual/getting_started/main.tex
@@ -40,7 +40,7 @@ software.  There is, however, more help available.  The Rockbox website at
 written by members of the Rockbox community and this should be your first port
 of call when looking for further help.
 
-\opt{Archos}{\input{chapter1/archos_choice}}
+\opt{player,recorder,recorderv2fm,ondio}{\input{getting_started/archos_choice}}
 
 
 \section{Downloading Rockbox}
diff --git a/manual/rockbox_interface/images/ss-file-browser-charx11x1.png b/manual/rockbox_interface/images/ss-file-browser-charx11x1.png
new file mode 100644
index 0000000000..b109e84a8d
Binary files /dev/null and b/manual/rockbox_interface/images/ss-file-browser-charx11x1.png differ
diff --git a/manual/rockbox_interface/images/ss-file-menu-charx11x1.png b/manual/rockbox_interface/images/ss-file-menu-charx11x1.png
new file mode 100644
index 0000000000..1beee1febf
Binary files /dev/null and b/manual/rockbox_interface/images/ss-file-menu-charx11x1.png differ