diff --git a/manual/main_menu/main.tex b/manual/main_menu/main.tex
index e6f3d24fb0..639060e953 100644
--- a/manual/main_menu/main.tex
+++ b/manual/main_menu/main.tex
@@ -98,12 +98,16 @@ that typically changes the WPS
 \opt{h1xx,h300,x5}{and remote WPS}, font used and on some platforms
 additional information such as background image and text colours.
 
-There are a number of themes that ship with Rockbox.  If none of
+There are a number of themes that ship with Rockbox. If none of
 these suit your needs, many more can be downloaded from 
-\url{www.rockbox.org/twiki/bin/view/Main/\opt{RECORDER_PAD}{/WpsArchos}
-\opt{h1xx}{WpsIriverH100}\opt{h300,ipodcolor}{WpsIriverH300}
-\opt{ipodvideo}{WpsIpod5g}\opt{ipodnano}{WpsIpodNano}
-\opt{ipodmini}{WpsIpodMini}\opt{x5}{WpsIaudioX5}}. 
+\opt{RECORDER_PAD}{\wikilink{WpsArchos}}%
+\opt{h1xx}{\wikilink{WpsIriverH100}}%
+\opt{h300,ipodcolor}{\wikilink{WpsIriverH300}}%
+\opt{ipodvideo}{\wikilink{WpsIpod5g}}%
+\opt{ipodnano}{\wikilink{WpsIpodNano}}%
+\opt{ipodmini}{\wikilink{WpsIpodMini}}%
+\opt{x5}{\wikilink{WpsIaudioX5}}%
+.
 Some of the downloads from this site will actually be standalone WPS files, 
 others will be full-blown themes. 
 
diff --git a/manual/preamble.tex b/manual/preamble.tex
index fd1e32165b..595b17e215 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -202,4 +202,10 @@
 
 \newcommand{\setting}[1]{\textsc{#1}}
 
-\newcommand{\config}[1]{\texttt{#1}}
\ No newline at end of file
+\newcommand{\config}[1]{\texttt{#1}}
+
+% set link to the wiki.
+% Usage: \wikilink{WebHome}
+%        with "WebHome" being the wiki page name
+\newcommand{\wikilink}[1]{\url{http://www.rockbox.org/twiki/bin/view/Main/#1}}
+