New credits format (DocBook conversion not yet done)

svn-id: r19809

6 files changed, 1086 insertions, 474 deletions

diff --git a/AUTHORS b/AUTHORS
index be7ba58b50..1adf96b6b1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,100 +1,200 @@
-The ScummVM team:
-       James Brown           - Lead developer
-       Max Horn              - Lead developer
-       Torbjorn Andersson    - Engine: SCUMM, Broken Sword 2, SAGA, Gob
-       David Eriksson        - Engine: Flight of the Amazon Queen
-       Robert Goeffringmann  - Engine: Beneath a Steel Sky, Broken Sword 1
-       Jonathan Gray         - Engine: SCUMM, HE, Broken Sword 2
-       Travis Howell         - Engine: SCUMM, HE, Simon the Sorcerer
-       Oliver Kiehl          - Engine: Beneath a Steel Sky, Simon
-       Pawel Kolodziejski    - Engine: SCUMM (Codecs, iMUSE, Smush, etc.)
-       Andrew Kurushin       - Engine: SAGA
-       Gregory Montoir       - Engine: Flight of the Amazon Queen, HE, Kyra
-       Joost Peters          - Engine: Beneath a Steel Sky, Flight of the
-                               Amazon Queen
-       Eugene Sandulenko     - Engine: SCUMM (FT INSANE), HE, SAGA, Gob
-       Johannes Schickel     - Engine: Kyra, GUI improvements
-       Chris Apers           - Port: PalmOS
-       Nicolas Bacca         - Port: PocketPC/WinCE
-       Jurgen Braam          - Port: EPOC/SymbianOS maintainer
-       Marcus Comstedt       - Port: Dreamcast
-       Hans-Jorg Frieden     - Port: AmigaOS 4
-       Lars Persson          - Port: EPOC/SymbianOS, ESDL
-       Jerome Fisher         - MT-32 emulator
-       Jochen Hoenicke       - Speaker & PCjr sound support, Adlib work
-
-Retired Team Members:
-       Ralph Brorsen         - Help with GUI implementation
-       Jamieson Christian    - iMUSE, MIDI, all things musical
-       Vincent Hamm          - Co-Founder
-       Ruediger Hanke        - Port: MorphOS
-       Felix Jakschitsch     - Zak256 reverse engineering
-       Mutwin Kraus          - Original MacOS porter
-       Peter Moraliyski      - Port: GP32
-       Jeremy Newman         - Former webmaster
-       Ludvig Strigeus       - Original ScummVM and SimonVM author
-       Lionel Ulmer          - Port: X11
-
-Contributors:
-       Tore Anderson         - Packaging for Debian GNU/Linux
-       Dobo Balazs           - Website design
-       Stuart Caie           - Decoders for Simon 1 Amiga data files
-       Yaroslav Fedevych     - HTML/CSS for the website
-       Chris Gray            - Windows64 builds
-       Janne Huttunen        - V3 actor mask support, Dig/FT SMUSH audio
-       Kovacs Endre Janos    - Several fixes for Simon1
-       Jeroen Janssen        - Numerous readability and bugfix patches
-       Andreas Karlsson      - Initial port for EPOC/SymbianOS
-       Robert Kelsen         - Packaging for SlackWare
-       Jean Marc             - ScummVM logo
-       Claudio Matsuoka      - Daily Linux builds
-       Kostas Nakos          - PocketPC 2002 builds
-       Mikesch Nepomuk       - MI1 VGA floppy patches
-       Juha Niemimaki        - AmigaOS 4 port maintaining
-       Nicolas Noble         - Config file and ALSA support
-       Willem Jan Palenstijn - Packaging for Fedora/RedHat
-       Stefan Parviainen     - Packaging for BeOS
-       Quietust              - Sound support for Amiga SCUMM V2/V3 games, MM
-                               NES support
-       Andreas Roever        - Broken Sword 1/2 MPEG2 cutscene support
-       Edward Rudd           - Fixes for playing MP3 versions of MI1/Loom
-                               audio
-       Daniel Schepler       - Final MI1 CD music support, initial Ogg Vorbis
-                               support
-       Paul Smedley          - OS/2 fixes and packaging
-       Andre Souza           - SDL-based OpenGL renderer
-       Tim ???               - Initial MI1 CD music support
-
-       And to all the contributors, users, and beta testers we've missed.
-       Thanks!
-
-Special thanks to:
-       Sander Buskens  - For his work on the initial reversing of Monkey2
-       Canadacow       - For the original MT-32 emulator
-       Kevin Carnes    - For Scumm16, the basis of ScummVM's older gfx codecs
-       Ivan Dubrov     - For contributing the initial version of the
-                         Gobliiins engine
-       Jezar           - For his freeverb filter implementation
-       Jim Leiterman   - Various info on his FM-TOWNS/Marty SCUMM ports
-       lloyd           - For deep tech details about C64 Zak & MM
-       Jimmi Thogersen - For ScummRev, and much obscure code/documentation
-       Tristan         - For additional work on the original MT-32 emulator
-
-       Tony Warriner and everyone at Revolution Software Ltd. for sharing
-       with us the source of some of their brilliant games, allowing us to
-       release Beneath a Steel Sky as freeware... and generally being
-       supportive above and beyond the call of duty.
-
-       John Passfield and Steve Stamatiadis for sharing the source of their
-       classic title, Flight of the Amazon Queen and also being incredibly
-       supportive.
-
-       Joe Pearce from The Wyrmkeep Entertainment Co. for sharing the source
-       of their famous title Inherit the Earth and always prompt replies to
-       our questions.
-
-       Aric Wilmunder, Ron Gilbert, David Fox, Vince Lee, and all those at
-       LucasFilm/LucasArts who made SCUMM the insane mess to reimplement that
-       it is today. Feel free to drop us a line and tell us what you think,
-       guys!
+ScummVM Team
+************
+  Project Leaders
+  ---------------
+     James Brown          
+     Max Horn              - This is a long desc. A really, really long long
+                             description. No I really mean *long* like in
+                             'very long'!
+
+  Engine Teams
+  ------------
+    SCUMM:
+       Torbjorn Andersson   
+       James Brown          
+       Jonathan Gray        
+       Max Horn             
+       Travis Howell        
+       Pawel Kolodziejski    - Codecs, iMUSE, Smush, etc.
+       Eugene Sandulenko     - FT INSANE
+
+    HE:
+       Jonathan Gray        
+       Travis Howell        
+       Gregory Montoir      
+       Eugene Sandulenko    
+
+    BASS:
+       Robert Goeffringmann 
+       Oliver Kiehl         
+       Joost Peters         
+
+    Broken Sword 1:
+       Robert Goeffringmann 
+
+    Broken Sword 2:
+       Torbjorn Andersson   
+       Jonathan Gray        
+
+    FOTAQ:
+       David Eriksson       
+       Gregory Montoir      
+       Joost Peters         
+
+    Gob:
+       Torbjorn Andersson   
+       Eugene Sandulenko    
+
+    Kyra:
+       Gregory Montoir      
+       Johannes Schickel    
+
+    SAGA:
+       Torbjorn Andersson   
+       Andrew Kurushin      
+       Eugene Sandulenko    
+
+    Simon:
+       Travis Howell        
+       Oliver Kiehl         
+
+  Backend Teams
+  -------------
+    Dreamcast:
+       Marcus Comstedt      
+
+    SymbianOS:
+       Jurgen Braam         
+       Lars Persson         
+
+    PalmOS:
+       Chris Apers          
+
+    PocketPC / WinCE:
+       Nicolas Bacca        
+
+    Playstation 2:
+       Robert Goeffringmann 
+
+    PSP (PlayStation Portable):
+       Joost Peters         
+
+    SDL (Win/Linux/OS X/etc.):
+       Max Horn             
+       Random Name           - TODO: Add yourself if you feel it's
+                               appropriate
+
+  Other subsystems
+  ----------------
+     Jerome Fisher         - MT-32 emulator
+     Jochen Hoenicke       - Speaker & PCjr sound support, Adlib work
+
+  Website (content)
+  -----------------
+     All active team members
+
+  Retired Team Members
+  --------------------
+     Ralph Brorsen         - Help with GUI implementation
+     Jamieson Christian    - iMUSE, MIDI, all things musical
+     Vincent Hamm          - Co-Founder
+     Ruediger Hanke        - Port: MorphOS
+     Felix Jakschitsch     - Zak256 reverse engineering
+     Mutwin Kraus          - Original MacOS porter
+     Peter Moraliyski      - Port: GP32
+     Jeremy Newman         - Former webmaster
+     Ludvig Strigeus       - Original ScummVM and SimonVM author
+     Lionel Ulmer          - Port: X11
+
+Other contributions
+*******************
+  Packages
+  --------
+    AmigaOS 4:
+       Hans-Jorg Frieden    
+       Juha Niemimaki       
+
+    BeOS:
+       Stefan Parviainen    
+
+    Debian GNU/Linux:
+       Tore Anderson        
+
+    Fedora / RedHat:
+       Willem Jan Palenstijn
+
+    Mac OS X:
+       Max Horn             
+
+    OS/2:
+       Paul Smedley         
+
+    PocketPC 2002:
+       Kostas Nakos         
+
+    SlackWare:
+       Robert Kelsen        
+
+    Win32:
+       Travis Howell        
+
+    Win64:
+       Chris Gray           
+
+  Website (design)
+  ----------------
+     Dobo Balazs           - Website design
+     Yaroslav Fedevych     - HTML/CSS for the website
+     Jean Marc             - ScummVM logo
+
+  Code contributions
+  ------------------
+     Stuart Caie           - Decoders for Simon 1 Amiga data files
+     Janne Huttunen        - V3 actor mask support, Dig/FT SMUSH audio
+     Kovacs Endre Janos    - Several fixes for Simon1
+     Jeroen Janssen        - Numerous readability and bugfix patches
+     Andreas Karlsson      - Initial port for EPOC/SymbianOS
+     Claudio Matsuoka      - Daily Linux builds
+     Mikesch Nepomuk       - MI1 VGA floppy patches
+     Nicolas Noble         - Config file and ALSA support
+     Quietust              - Sound support for Amiga SCUMM V2/V3 games, MM
+                             NES support
+     Andreas Roever        - Broken Sword 1/2 MPEG2 cutscene support
+     Edward Rudd           - Fixes for playing MP3 versions of MI1/Loom audio
+     Daniel Schepler       - Final MI1 CD music support, initial Ogg Vorbis
+                             support
+     Andre Souza           - SDL-based OpenGL renderer
+     Tim ???               - Initial MI1 CD music support
+
+   And to all the contributors, users, and beta testers we've missed. Thanks!
+
+Special thanks to
+*****************
+   Sander Buskens  - For his work on the initial reversing of Monkey2
+   Canadacow       - For the original MT-32 emulator
+   Kevin Carnes    - For Scumm16, the basis of ScummVM's older gfx codecs
+   Ivan Dubrov     - For contributing the initial version of the Gobliiins
+                     engine
+   Jezar           - For his freeverb filter implementation
+   Jim Leiterman   - Various info on his FM-TOWNS/Marty SCUMM ports
+   lloyd           - For deep tech details about C64 Zak & MM
+   Jimmi Thogersen - For ScummRev, and much obscure code/documentation
+   Tristan         - For additional work on the original MT-32 emulator
+
+   Tony Warriner and everyone at Revolution Software Ltd. for sharing with us
+   the source of some of their brilliant games, allowing us to release
+   Beneath a Steel Sky as freeware... and generally being supportive above
+   and beyond the call of duty.
+
+   John Passfield and Steve Stamatiadis for sharing the source of their
+   classic title, Flight of the Amazon Queen and also being incredibly
+   supportive.
+
+   Joe Pearce from The Wyrmkeep Entertainment Co. for sharing the source of
+   their famous title Inherit the Earth and always prompt replies to our
+   questions.
+
+   Aric Wilmunder, Ron Gilbert, David Fox, Vince Lee, and all those at
+   LucasFilm/LucasArts who made SCUMM the insane mess to reimplement that it
+   is today. Feel free to drop us a line and tell us what you think, guys!
 
diff --git a/doc/10.tex b/doc/10.tex
index 3a00edb912..3031c00883 100644
--- a/doc/10.tex
+++ b/doc/10.tex
@@ -1,93 +1,289 @@
 % This file was generated by credits.pl. Do not edit by hand!
 \section{Credits}
-\begin{itemize}
-\item \textbf{The ScummVM team}\\
-  \begin{tabular}[h]{p{4cm}l}
-    James Brown & Lead developer\\
-    Max Horn & Lead developer\\
-    Torbj\"orn Andersson & Engine: SCUMM, Broken Sword 2, SAGA, Gob\\
-    David Eriksson & Engine: Flight of the Amazon Queen\\
-    Robert G\"offringmann & Engine: Beneath a Steel Sky, Broken Sword 1\\
-    Jonathan Gray & Engine: SCUMM, HE, Broken Sword 2\\
-    Travis Howell & Engine: SCUMM, HE, Simon the Sorcerer\\
-    Oliver Kiehl & Engine: Beneath a Steel Sky, Simon\\
-    Pawe{\l} Ko{\l}odziejski & Engine: SCUMM (Codecs, iMUSE, Smush, etc.)\\
-    Andrew Kurushin & Engine: SAGA\\
-    Gregory Montoir & Engine: Flight of the Amazon Queen, HE, Kyra\\
-    Joost Peters & Engine: Beneath a Steel Sky, Flight of the Amazon Queen\\
-    Eugene Sandulenko & Engine: SCUMM (FT INSANE), HE, SAGA, Gob\\
-    Johannes Schickel & Engine: Kyra, GUI improvements\\
-    Chris Apers & Port: PalmOS\\
-    Nicolas Bacca & Port: PocketPC/WinCE\\
-    Jurgen Braam & Port: EPOC/SymbianOS maintainer\\
-    Marcus Comstedt & Port: Dreamcast\\
-    Hans-J\"org Frieden & Port: AmigaOS 4\\
-    Lars Persson & Port: EPOC/SymbianOS, ESDL\\
-    Jerome Fisher & MT-32 emulator\\
-    Jochen Hoenicke & Speaker \& PCjr sound support, Adlib work\\
-  \end{tabular}
-\item \textbf{Retired Team Members}\\
-  \begin{tabular}[h]{p{4cm}l}
-    Ralph Brorsen & Help with GUI implementation\\
-    Jamieson Christian & iMUSE, MIDI, all things musical\\
-    Vincent Hamm & Co-Founder\\
-    Ruediger Hanke & Port: MorphOS\\
-    Felix Jakschitsch & Zak256 reverse engineering\\
-    Mutwin Kraus & Original MacOS porter\\
-    Peter Moraliyski & Port: GP32\\
-    Jeremy Newman & Former webmaster\\
-    Ludvig Strigeus & Original ScummVM and SimonVM author\\
-    Lionel Ulmer & Port: X11\\
-  \end{tabular}
-\item \textbf{Contributors}\\
-  \begin{tabular}[h]{p{4cm}l}
-    Tore Anderson & Packaging for Debian GNU/Linux\\
-    Dobó Bal\'azs & Website design\\
-    Stuart Caie & Decoders for Simon 1 Amiga data files\\
-    Yaroslav Fedevych & HTML/CSS for the website\\
-    Chris Gray & Windows64 builds\\
-    Janne Huttunen & V3 actor mask support, Dig/FT SMUSH audio\\
-    Kov\'acs Endre J\'anos & Several fixes for Simon1\\
-    Jeroen Janssen & Numerous readability and bugfix patches\\
-    Andreas Karlsson & Initial port for EPOC/SymbianOS\\
-    Robert Kelsen & Packaging for SlackWare\\
-    Jean Marc & ScummVM logo\\
-    Claudio Matsuoka & Daily Linux builds\\
-    Kostas Nakos & PocketPC 2002 builds\\
-    Mikesch Nepomuk & MI1 VGA floppy patches\\
-    Juha Niemim\"aki & AmigaOS 4 port maintaining\\
-    Nicolas Noble & Config file and ALSA support\\
-    Willem Jan Palenstijn & Packaging for Fedora/RedHat\\
-    Stefan Parviainen & Packaging for BeOS\\
-    Quietust & Sound support for Amiga SCUMM V2/V3 games, MM NES support\\
-    Andreas R\"over & Broken Sword 1/2 MPEG2 cutscene support\\
-    Edward Rudd & Fixes for playing MP3 versions of MI1/Loom audio\\
-    Daniel Schepler & Final MI1 CD music support, initial Ogg Vorbis support\\
-    Paul Smedley & OS/2 fixes and packaging\\
-    Andr\'e Souza & SDL-based OpenGL renderer\\
-    Tim ??? & Initial MI1 CD music support\\
+\begin{trivlist}
+\item \textbf{\LARGE ScummVM Team}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item \textbf{\large Project Leaders}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    James Brown & \textit{}\\
+    Max Horn & \textit{This is a long desc. A really, really long long description. No I really mean *long* like in 'very long'!}\\
   \end{tabular}
-
+\end{list}
+\item \textbf{\large Engine Teams}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item \textbf{ SCUMM}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Torbj\"orn Andersson & \textit{}\\
+    James Brown & \textit{}\\
+    Jonathan Gray & \textit{}\\
+    Max Horn & \textit{}\\
+    Travis Howell & \textit{}\\
+    Pawe{\l} Ko{\l}odziejski & \textit{Codecs, iMUSE, Smush, etc.}\\
+    Eugene Sandulenko & \textit{FT INSANE}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ HE}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Jonathan Gray & \textit{}\\
+    Travis Howell & \textit{}\\
+    Gregory Montoir & \textit{}\\
+    Eugene Sandulenko & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ BASS}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Robert G\"offringmann & \textit{}\\
+    Oliver Kiehl & \textit{}\\
+    Joost Peters & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ Broken Sword 1}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Robert G\"offringmann & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ Broken Sword 2}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Torbj\"orn Andersson & \textit{}\\
+    Jonathan Gray & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ FOTAQ}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    David Eriksson & \textit{}\\
+    Gregory Montoir & \textit{}\\
+    Joost Peters & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ Gob}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Torbj\"orn Andersson & \textit{}\\
+    Eugene Sandulenko & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ Kyra}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Gregory Montoir & \textit{}\\
+    Johannes Schickel & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ SAGA}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Torbj\"orn Andersson & \textit{}\\
+    Andrew Kurushin & \textit{}\\
+    Eugene Sandulenko & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ Simon}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Travis Howell & \textit{}\\
+    Oliver Kiehl & \textit{}\\
+  \end{tabular}
+\end{list}
+\end{list}
+\item \textbf{\large Backend Teams}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item \textbf{ Dreamcast}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Marcus Comstedt & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ SymbianOS}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Jurgen Braam & \textit{}\\
+    Lars Persson & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ PalmOS}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Chris Apers & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ PocketPC / WinCE}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Nicolas Bacca & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ Playstation 2}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Robert G\"offringmann & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ PSP (PlayStation Portable)}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Joost Peters & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ SDL (Win/Linux/OS X/etc.)}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Max Horn & \textit{}\\
+    Random Name & \textit{TODO: Add yourself if you feel it's appropriate}\\
+  \end{tabular}
+\end{list}
+\end{list}
+\item \textbf{\large Other subsystems}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Jerome Fisher & \textit{MT-32 emulator}\\
+    Jochen Hoenicke & \textit{Speaker \& PCjr sound support, Adlib work}\\
+  \end{tabular}
+\end{list}
+\item \textbf{\large Website (content)}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item
+All active team members
+\end{list}
+\item \textbf{\large Retired Team Members}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Ralph Brorsen & \textit{Help with GUI implementation}\\
+    Jamieson Christian & \textit{iMUSE, MIDI, all things musical}\\
+    Vincent Hamm & \textit{Co-Founder}\\
+    Ruediger Hanke & \textit{Port: MorphOS}\\
+    Felix Jakschitsch & \textit{Zak256 reverse engineering}\\
+    Mutwin Kraus & \textit{Original MacOS porter}\\
+    Peter Moraliyski & \textit{Port: GP32}\\
+    Jeremy Newman & \textit{Former webmaster}\\
+    Ludvig Strigeus & \textit{Original ScummVM and SimonVM author}\\
+    Lionel Ulmer & \textit{Port: X11}\\
+  \end{tabular}
+\end{list}
+\end{list}
+\item \textbf{\LARGE Other contributions}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item \textbf{\large Packages}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item \textbf{ AmigaOS 4}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Hans-J\"org Frieden & \textit{}\\
+    Juha Niemim\"aki & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ BeOS}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Stefan Parviainen & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ Debian GNU/Linux}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Tore Anderson & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ Fedora / RedHat}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Willem Jan Palenstijn & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ Mac OS X}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Max Horn & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ OS/2}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Paul Smedley & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ PocketPC 2002}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Kostas Nakos & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ SlackWare}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Robert Kelsen & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ Win32}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Travis Howell & \textit{}\\
+  \end{tabular}
+\end{list}
+\item \textbf{ Win64}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Chris Gray & \textit{}\\
+  \end{tabular}
+\end{list}
+\end{list}
+\item \textbf{\large Website (design)}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Dob\'o Bal\'azs & \textit{Website design}\\
+    Yaroslav Fedevych & \textit{HTML/CSS for the website}\\
+    Jean Marc & \textit{ScummVM logo}\\
+  \end{tabular}
+\end{list}
+\item \textbf{\large Code contributions}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Stuart Caie & \textit{Decoders for Simon 1 Amiga data files}\\
+    Janne Huttunen & \textit{V3 actor mask support, Dig/FT SMUSH audio}\\
+    Kov\'acs Endre J\'anos & \textit{Several fixes for Simon1}\\
+    Jeroen Janssen & \textit{Numerous readability and bugfix patches}\\
+    Andreas Karlsson & \textit{Initial port for EPOC/SymbianOS}\\
+    Claudio Matsuoka & \textit{Daily Linux builds}\\
+    Mikesch Nepomuk & \textit{MI1 VGA floppy patches}\\
+    Nicolas Noble & \textit{Config file and ALSA support}\\
+    Quietust & \textit{Sound support for Amiga SCUMM V2/V3 games, MM NES support}\\
+    Andreas R\"over & \textit{Broken Sword 1/2 MPEG2 cutscene support}\\
+    Edward Rudd & \textit{Fixes for playing MP3 versions of MI1/Loom audio}\\
+    Daniel Schepler & \textit{Final MI1 CD music support, initial Ogg Vorbis support}\\
+    Andr\'e Souza & \textit{SDL-based OpenGL renderer}\\
+    Tim ??? & \textit{Initial MI1 CD music support}\\
+  \end{tabular}
+\end{list}
+\item
 And to all the contributors, users, and beta testers we've missed. Thanks!
-\item \textbf{Special thanks to}\\
-  \begin{tabular}[h]{p{4cm}l}
-    Sander Buskens & For his work on the initial reversing of Monkey2\\
-    Canadacow & For the original MT-32 emulator\\
-    Kevin Carnes & For Scumm16, the basis of ScummVM's older gfx codecs\\
-    Ivan Dubrov & For contributing the initial version of the Gobliiins engine\\
-    Jezar & For his freeverb filter implementation\\
-    Jim Leiterman & Various info on his FM-TOWNS/Marty SCUMM ports\\
-    lloyd & For deep tech details about C64 Zak \& MM\\
-    Jimmi Th{\o}gersen & For ScummRev, and much obscure code/documentation\\
-    Tristan & For additional work on the original MT-32 emulator\\
+\end{list}
+\item \textbf{\LARGE Special thanks to}
+\begin{list}{}{\setlength{\leftmargin}{0.2cm}}
+\item  \begin{tabular}[h]{p{4cm}l}
+    Sander Buskens & \textit{For his work on the initial reversing of Monkey2}\\
+    Canadacow & \textit{For the original MT-32 emulator}\\
+    Kevin Carnes & \textit{For Scumm16, the basis of ScummVM's older gfx codecs}\\
+    Ivan Dubrov & \textit{For contributing the initial version of the Gobliiins engine}\\
+    Jezar & \textit{For his freeverb filter implementation}\\
+    Jim Leiterman & \textit{Various info on his FM-TOWNS/Marty SCUMM ports}\\
+    lloyd & \textit{For deep tech details about C64 Zak \& MM}\\
+    Jimmi Th{\o}gersen & \textit{For ScummRev, and much obscure code/documentation}\\
+    Tristan & \textit{For additional work on the original MT-32 emulator}\\
   \end{tabular}
-
+\item
 Tony Warriner and everyone at Revolution Software Ltd. for sharing with us the source of some of their brilliant games, allowing us to release Beneath a Steel Sky as freeware... and generally being supportive above and beyond the call of duty.
-
+\item
 John Passfield and Steve Stamatiadis for sharing the source of their classic title, Flight of the Amazon Queen and also being incredibly supportive.
-
+\item
 Joe Pearce from The Wyrmkeep Entertainment Co. for sharing the source of their famous title Inherit the Earth and always prompt replies to our questions.
-
+\item
 Aric Wilmunder, Ron Gilbert, David Fox, Vince Lee, and all those at LucasFilm/LucasArts who made SCUMM the insane mess to reimplement that it is today. Feel free to drop us a line and tell us what you think, guys!
-\end{itemize}
+\end{list}
+\end{trivlist}
 
diff --git a/gui/about.cpp b/gui/about.cpp
index 00fba497d7..b4342d0526 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -31,7 +31,7 @@ namespace GUI {
 
 enum {
 	kScrollStartDelay = 1500,
-	kScrollMillisPerPixel = 80
+	kScrollMillisPerPixel = 60
 };
 
 // The following commands can be put at the start of a line (all subject to change):
@@ -45,6 +45,9 @@ enum {
 // TODO: Maybe add a tab/indent feature; that is, make it possible to specify
 // an amount by which that line shall be indented (the indent of course would have
 // to be considered while performing any word wrapping, too).
+//
+// TODO: Add different font sizes (for bigger headlines)
+// TODO: Allow color change in the middle of a line...
 static const char *credits_intro[] = {
 "\\C""Copyright (C) 2002-2005 The ScummVM project",
 "\\C""http://www.scummvm.org",
diff --git a/gui/credits.h b/gui/credits.h
index ca8de40a4a..29d1b1eb94 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -1,164 +1,227 @@
 // This file was generated by credits.pl. Do not edit by hand!
 static const char *credits[] = {
-"\\C\\c1""The ScummVM team:",
-"\\L\\c0""  James Brown",
-"\\L\\c2""    Lead developer",
-"\\L\\c0""  Max Horn",
-"\\L\\c2""    Lead developer",
-"\\L\\c0""  Torbjorn Andersson",
-"\\L\\c2""    Engine: SCUMM, Broken Sword 2, SAGA, Gob",
-"\\L\\c0""  David Eriksson",
-"\\L\\c2""    Engine: Flight of the Amazon Queen",
-"\\L\\c0""  Robert Goeffringmann",
-"\\L\\c2""    Engine: Beneath a Steel Sky, Broken Sword 1",
-"\\L\\c0""  Jonathan Gray",
-"\\L\\c2""    Engine: SCUMM, HE, Broken Sword 2",
-"\\L\\c0""  Travis Howell",
-"\\L\\c2""    Engine: SCUMM, HE, Simon the Sorcerer",
-"\\L\\c0""  Oliver Kiehl",
-"\\L\\c2""    Engine: Beneath a Steel Sky, Simon",
-"\\L\\c0""  Pawel Kolodziejski",
-"\\L\\c2""    Engine: SCUMM (Codecs, iMUSE, Smush, etc.)",
-"\\L\\c0""  Andrew Kurushin",
-"\\L\\c2""    Engine: SAGA",
-"\\L\\c0""  Gregory Montoir",
-"\\L\\c2""    Engine: Flight of the Amazon Queen, HE,",
-"\\L\\c2""    Kyra",
-"\\L\\c0""  Joost Peters",
-"\\L\\c2""    Engine: Beneath a Steel Sky, Flight of the",
-"\\L\\c2""    Amazon Queen",
-"\\L\\c0""  Eugene Sandulenko",
-"\\L\\c2""    Engine: SCUMM (FT INSANE), HE, SAGA, Gob",
-"\\L\\c0""  Johannes Schickel",
-"\\L\\c2""    Engine: Kyra, GUI improvements",
-"\\L\\c0""  Chris Apers",
-"\\L\\c2""    Port: PalmOS",
-"\\L\\c0""  Nicolas Bacca",
-"\\L\\c2""    Port: PocketPC/WinCE",
-"\\L\\c0""  Jurgen Braam",
-"\\L\\c2""    Port: EPOC/SymbianOS maintainer",
-"\\L\\c0""  Marcus Comstedt",
-"\\L\\c2""    Port: Dreamcast",
-"\\L\\c0""  Hans-Jorg Frieden",
-"\\L\\c2""    Port: AmigaOS 4",
-"\\L\\c0""  Lars Persson",
-"\\L\\c2""    Port: EPOC/SymbianOS, ESDL",
-"\\L\\c0""  Jerome Fisher",
-"\\L\\c2""    MT-32 emulator",
-"\\L\\c0""  Jochen Hoenicke",
-"\\L\\c2""    Speaker & PCjr sound support, Adlib work",
-"\\L\\c0""",
-"\\C\\c1""Retired Team Members:",
-"\\L\\c0""  Ralph Brorsen",
-"\\L\\c2""    Help with GUI implementation",
-"\\L\\c0""  Jamieson Christian",
-"\\L\\c2""    iMUSE, MIDI, all things musical",
-"\\L\\c0""  Vincent Hamm",
-"\\L\\c2""    Co-Founder",
-"\\L\\c0""  Ruediger Hanke",
-"\\L\\c2""    Port: MorphOS",
-"\\L\\c0""  Felix Jakschitsch",
-"\\L\\c2""    Zak256 reverse engineering",
-"\\L\\c0""  Mutwin Kraus",
-"\\L\\c2""    Original MacOS porter",
-"\\L\\c0""  Peter Moraliyski",
-"\\L\\c2""    Port: GP32",
-"\\L\\c0""  Jeremy Newman",
-"\\L\\c2""    Former webmaster",
-"\\L\\c0""  Ludvig Strigeus",
-"\\L\\c2""    Original ScummVM and SimonVM author",
-"\\L\\c0""  Lionel Ulmer",
-"\\L\\c2""    Port: X11",
-"\\L\\c0""",
-"\\C\\c1""Contributors:",
-"\\L\\c0""  Tore Anderson",
-"\\L\\c2""    Packaging for Debian GNU/Linux",
-"\\L\\c0""  Dobo Balazs",
-"\\L\\c2""    Website design",
-"\\L\\c0""  Stuart Caie",
-"\\L\\c2""    Decoders for Simon 1 Amiga data files",
-"\\L\\c0""  Yaroslav Fedevych",
-"\\L\\c2""    HTML/CSS for the website",
-"\\L\\c0""  Chris Gray",
-"\\L\\c2""    Windows64 builds",
-"\\L\\c0""  Janne Huttunen",
-"\\L\\c2""    V3 actor mask support, Dig/FT SMUSH audio",
-"\\L\\c0""  Kovacs Endre Janos",
-"\\L\\c2""    Several fixes for Simon1",
-"\\L\\c0""  Jeroen Janssen",
-"\\L\\c2""    Numerous readability and bugfix patches",
-"\\L\\c0""  Andreas Karlsson",
-"\\L\\c2""    Initial port for EPOC/SymbianOS",
-"\\L\\c0""  Robert Kelsen",
-"\\L\\c2""    Packaging for SlackWare",
-"\\L\\c0""  Jean Marc",
-"\\L\\c2""    ScummVM logo",
-"\\L\\c0""  Claudio Matsuoka",
-"\\L\\c2""    Daily Linux builds",
-"\\L\\c0""  Kostas Nakos",
-"\\L\\c2""    PocketPC 2002 builds",
-"\\L\\c0""  Mikesch Nepomuk",
-"\\L\\c2""    MI1 VGA floppy patches",
-"\\L\\c0""  Juha Niemimaki",
-"\\L\\c2""    AmigaOS 4 port maintaining",
-"\\L\\c0""  Nicolas Noble",
-"\\L\\c2""    Config file and ALSA support",
-"\\L\\c0""  Willem Jan Palenstijn",
-"\\L\\c2""    Packaging for Fedora/RedHat",
-"\\L\\c0""  Stefan Parviainen",
-"\\L\\c2""    Packaging for BeOS",
-"\\L\\c0""  Quietust",
-"\\L\\c2""    Sound support for Amiga SCUMM V2/V3 games,",
-"\\L\\c2""    MM NES support",
-"\\L\\c0""  Andreas Roever",
-"\\L\\c2""    Broken Sword 1/2 MPEG2 cutscene support",
-"\\L\\c0""  Edward Rudd",
-"\\L\\c2""    Fixes for playing MP3 versions of MI1/Loom",
-"\\L\\c2""    audio",
-"\\L\\c0""  Daniel Schepler",
-"\\L\\c2""    Final MI1 CD music support, initial Ogg",
-"\\L\\c2""    Vorbis support",
-"\\L\\c0""  Paul Smedley",
-"\\L\\c2""    OS/2 fixes and packaging",
-"\\L\\c0""  Andre Souza",
-"\\L\\c2""    SDL-based OpenGL renderer",
-"\\L\\c0""  Tim ???",
-"\\L\\c2""    Initial MI1 CD music support",
-"\\L\\c0""",
-"\\L\\c0""And to all the contributors, users, and beta testers we've missed. Thanks!",
-"\\L\\c0""",
-"\\C\\c1""Special thanks to:",
-"\\L\\c0""  Sander Buskens",
-"\\L\\c2""    For his work on the initial reversing of",
-"\\L\\c2""    Monkey2",
-"\\L\\c0""  Canadacow",
-"\\L\\c2""    For the original MT-32 emulator",
-"\\L\\c0""  Kevin Carnes",
-"\\L\\c2""    For Scumm16, the basis of ScummVM's older",
-"\\L\\c2""    gfx codecs",
-"\\L\\c0""  Ivan Dubrov",
-"\\L\\c2""    For contributing the initial version of the",
-"\\L\\c2""    Gobliiins engine",
-"\\L\\c0""  Jezar",
-"\\L\\c2""    For his freeverb filter implementation",
-"\\L\\c0""  Jim Leiterman",
-"\\L\\c2""    Various info on his FM-TOWNS/Marty SCUMM",
-"\\L\\c2""    ports",
-"\\L\\c0""  lloyd",
-"\\L\\c2""    For deep tech details about C64 Zak & MM",
-"\\L\\c0""  Jimmi Thogersen",
-"\\L\\c2""    For ScummRev, and much obscure",
-"\\L\\c2""    code/documentation",
-"\\L\\c0""  Tristan",
-"\\L\\c2""    For additional work on the original MT-32",
-"\\L\\c2""    emulator",
-"\\L\\c0""",
-"\\L\\c0""Tony Warriner and everyone at Revolution Software Ltd. for sharing with us the source of some of their brilliant games, allowing us to release Beneath a Steel Sky as freeware... and generally being supportive above and beyond the call of duty.",
-"\\L\\c0""",
-"\\L\\c0""John Passfield and Steve Stamatiadis for sharing the source of their classic title, Flight of the Amazon Queen and also being incredibly supportive.",
-"\\L\\c0""",
-"\\L\\c0""Joe Pearce from The Wyrmkeep Entertainment Co. for sharing the source of their famous title Inherit the Earth and always prompt replies to our questions.",
-"\\L\\c0""",
-"\\L\\c0""Aric Wilmunder, Ron Gilbert, David Fox, Vince Lee, and all those at LucasFilm/LucasArts who made SCUMM the insane mess to reimplement that it is today. Feel free to drop us a line and tell us what you think, guys!",
-"\\L\\c0""",
+"\\C\\c1""ScummVM Team",
+"\\C\\c0""",
+"\\C\\c1""Project Leaders",
+"\\C\\c0""James Brown",
+"\\C\\c0""Max Horn",
+"\\C\\c2""This is a long desc. A really, really long long description. No I really mean *long* like in 'very long'!",
+"\\C\\c0""",
+"\\C\\c1""Engine Teams",
+"\\C\\c1""SCUMM",
+"\\C\\c0""Torbjorn Andersson",
+"\\C\\c0""James Brown",
+"\\C\\c0""Jonathan Gray",
+"\\C\\c0""Max Horn",
+"\\C\\c0""Travis Howell",
+"\\C\\c0""Pawel Kolodziejski",
+"\\C\\c2""Codecs, iMUSE, Smush, etc.",
+"\\C\\c0""Eugene Sandulenko",
+"\\C\\c2""FT INSANE",
+"\\C\\c0""",
+"\\C\\c1""HE",
+"\\C\\c0""Jonathan Gray",
+"\\C\\c0""Travis Howell",
+"\\C\\c0""Gregory Montoir",
+"\\C\\c0""Eugene Sandulenko",
+"\\C\\c0""",
+"\\C\\c1""BASS",
+"\\C\\c0""Robert Goeffringmann",
+"\\C\\c0""Oliver Kiehl",
+"\\C\\c0""Joost Peters",
+"\\C\\c0""",
+"\\C\\c1""Broken Sword 1",
+"\\C\\c0""Robert Goeffringmann",
+"\\C\\c0""",
+"\\C\\c1""Broken Sword 2",
+"\\C\\c0""Torbjorn Andersson",
+"\\C\\c0""Jonathan Gray",
+"\\C\\c0""",
+"\\C\\c1""FOTAQ",
+"\\C\\c0""David Eriksson",
+"\\C\\c0""Gregory Montoir",
+"\\C\\c0""Joost Peters",
+"\\C\\c0""",
+"\\C\\c1""Gob",
+"\\C\\c0""Torbjorn Andersson",
+"\\C\\c0""Eugene Sandulenko",
+"\\C\\c0""",
+"\\C\\c1""Kyra",
+"\\C\\c0""Gregory Montoir",
+"\\C\\c0""Johannes Schickel",
+"\\C\\c0""",
+"\\C\\c1""SAGA",
+"\\C\\c0""Torbjorn Andersson",
+"\\C\\c0""Andrew Kurushin",
+"\\C\\c0""Eugene Sandulenko",
+"\\C\\c0""",
+"\\C\\c1""Simon",
+"\\C\\c0""Travis Howell",
+"\\C\\c0""Oliver Kiehl",
+"\\C\\c0""",
+"\\C\\c0""",
+"\\C\\c1""Backend Teams",
+"\\C\\c1""Dreamcast",
+"\\C\\c0""Marcus Comstedt",
+"\\C\\c0""",
+"\\C\\c1""SymbianOS",
+"\\C\\c0""Jurgen Braam",
+"\\C\\c0""Lars Persson",
+"\\C\\c0""",
+"\\C\\c1""PalmOS",
+"\\C\\c0""Chris Apers",
+"\\C\\c0""",
+"\\C\\c1""PocketPC / WinCE",
+"\\C\\c0""Nicolas Bacca",
+"\\C\\c0""",
+"\\C\\c1""Playstation 2",
+"\\C\\c0""Robert Goeffringmann",
+"\\C\\c0""",
+"\\C\\c1""PSP (PlayStation Portable)",
+"\\C\\c0""Joost Peters",
+"\\C\\c0""",
+"\\C\\c1""SDL (Win/Linux/OS X/etc.)",
+"\\C\\c0""Max Horn",
+"\\C\\c0""Random Name",
+"\\C\\c2""TODO: Add yourself if you feel it's appropriate",
+"\\C\\c0""",
+"\\C\\c0""",
+"\\C\\c1""Other subsystems",
+"\\C\\c0""Jerome Fisher",
+"\\C\\c2""MT-32 emulator",
+"\\C\\c0""Jochen Hoenicke",
+"\\C\\c2""Speaker & PCjr sound support, Adlib work",
+"\\C\\c0""",
+"\\C\\c1""Website (content)",
+"\\C\\c0""All active team members",
+"\\C\\c0""",
+"\\C\\c0""",
+"\\C\\c1""Retired Team Members",
+"\\C\\c0""Ralph Brorsen",
+"\\C\\c2""Help with GUI implementation",
+"\\C\\c0""Jamieson Christian",
+"\\C\\c2""iMUSE, MIDI, all things musical",
+"\\C\\c0""Vincent Hamm",
+"\\C\\c2""Co-Founder",
+"\\C\\c0""Ruediger Hanke",
+"\\C\\c2""Port: MorphOS",
+"\\C\\c0""Felix Jakschitsch",
+"\\C\\c2""Zak256 reverse engineering",
+"\\C\\c0""Mutwin Kraus",
+"\\C\\c2""Original MacOS porter",
+"\\C\\c0""Peter Moraliyski",
+"\\C\\c2""Port: GP32",
+"\\C\\c0""Jeremy Newman",
+"\\C\\c2""Former webmaster",
+"\\C\\c0""Ludvig Strigeus",
+"\\C\\c2""Original ScummVM and SimonVM author",
+"\\C\\c0""Lionel Ulmer",
+"\\C\\c2""Port: X11",
+"\\C\\c0""",
+"\\C\\c0""",
+"\\C\\c1""Other contributions",
+"\\C\\c0""",
+"\\C\\c1""Packages",
+"\\C\\c1""AmigaOS 4",
+"\\C\\c0""Hans-Jorg Frieden",
+"\\C\\c0""Juha Niemimaki",
+"\\C\\c0""",
+"\\C\\c1""BeOS",
+"\\C\\c0""Stefan Parviainen",
+"\\C\\c0""",
+"\\C\\c1""Debian GNU/Linux",
+"\\C\\c0""Tore Anderson",
+"\\C\\c0""",
+"\\C\\c1""Fedora / RedHat",
+"\\C\\c0""Willem Jan Palenstijn",
+"\\C\\c0""",
+"\\C\\c1""Mac OS X",
+"\\C\\c0""Max Horn",
+"\\C\\c0""",
+"\\C\\c1""OS/2",
+"\\C\\c0""Paul Smedley",
+"\\C\\c0""",
+"\\C\\c1""PocketPC 2002",
+"\\C\\c0""Kostas Nakos",
+"\\C\\c0""",
+"\\C\\c1""SlackWare",
+"\\C\\c0""Robert Kelsen",
+"\\C\\c0""",
+"\\C\\c1""Win32",
+"\\C\\c0""Travis Howell",
+"\\C\\c0""",
+"\\C\\c1""Win64",
+"\\C\\c0""Chris Gray",
+"\\C\\c0""",
+"\\C\\c0""",
+"\\C\\c1""Website (design)",
+"\\C\\c0""Dobo Balazs",
+"\\C\\c2""Website design",
+"\\C\\c0""Yaroslav Fedevych",
+"\\C\\c2""HTML/CSS for the website",
+"\\C\\c0""Jean Marc",
+"\\C\\c2""ScummVM logo",
+"\\C\\c0""",
+"\\C\\c1""Code contributions",
+"\\C\\c0""Stuart Caie",
+"\\C\\c2""Decoders for Simon 1 Amiga data files",
+"\\C\\c0""Janne Huttunen",
+"\\C\\c2""V3 actor mask support, Dig/FT SMUSH audio",
+"\\C\\c0""Kovacs Endre Janos",
+"\\C\\c2""Several fixes for Simon1",
+"\\C\\c0""Jeroen Janssen",
+"\\C\\c2""Numerous readability and bugfix patches",
+"\\C\\c0""Andreas Karlsson",
+"\\C\\c2""Initial port for EPOC/SymbianOS",
+"\\C\\c0""Claudio Matsuoka",
+"\\C\\c2""Daily Linux builds",
+"\\C\\c0""Mikesch Nepomuk",
+"\\C\\c2""MI1 VGA floppy patches",
+"\\C\\c0""Nicolas Noble",
+"\\C\\c2""Config file and ALSA support",
+"\\C\\c0""Quietust",
+"\\C\\c2""Sound support for Amiga SCUMM V2/V3 games, MM NES support",
+"\\C\\c0""Andreas Roever",
+"\\C\\c2""Broken Sword 1/2 MPEG2 cutscene support",
+"\\C\\c0""Edward Rudd",
+"\\C\\c2""Fixes for playing MP3 versions of MI1/Loom audio",
+"\\C\\c0""Daniel Schepler",
+"\\C\\c2""Final MI1 CD music support, initial Ogg Vorbis support",
+"\\C\\c0""Andre Souza",
+"\\C\\c2""SDL-based OpenGL renderer",
+"\\C\\c0""Tim ???",
+"\\C\\c2""Initial MI1 CD music support",
+"\\C\\c0""",
+"\\C\\c0""And to all the contributors, users, and beta testers we've missed. Thanks!",
+"\\C\\c0""",
+"\\C\\c0""",
+"\\C\\c1""Special thanks to",
+"\\C\\c0""",
+"\\C\\c0""Sander Buskens",
+"\\C\\c2""For his work on the initial reversing of Monkey2",
+"\\C\\c0""Canadacow",
+"\\C\\c2""For the original MT-32 emulator",
+"\\C\\c0""Kevin Carnes",
+"\\C\\c2""For Scumm16, the basis of ScummVM's older gfx codecs",
+"\\C\\c0""Ivan Dubrov",
+"\\C\\c2""For contributing the initial version of the Gobliiins engine",
+"\\C\\c0""Jezar",
+"\\C\\c2""For his freeverb filter implementation",
+"\\C\\c0""Jim Leiterman",
+"\\C\\c2""Various info on his FM-TOWNS/Marty SCUMM ports",
+"\\C\\c0""lloyd",
+"\\C\\c2""For deep tech details about C64 Zak & MM",
+"\\C\\c0""Jimmi Thogersen",
+"\\C\\c2""For ScummRev, and much obscure code/documentation",
+"\\C\\c0""Tristan",
+"\\C\\c2""For additional work on the original MT-32 emulator",
+"\\C\\c0""Tony Warriner and everyone at Revolution Software Ltd. for sharing with us the source of some of their brilliant games, allowing us to release Beneath a Steel Sky as freeware... and generally being supportive above and beyond the call of duty.",
+"\\C\\c0""",
+"\\C\\c0""John Passfield and Steve Stamatiadis for sharing the source of their classic title, Flight of the Amazon Queen and also being incredibly supportive.",
+"\\C\\c0""",
+"\\C\\c0""Joe Pearce from The Wyrmkeep Entertainment Co. for sharing the source of their famous title Inherit the Earth and always prompt replies to our questions.",
+"\\C\\c0""",
+"\\C\\c0""Aric Wilmunder, Ron Gilbert, David Fox, Vince Lee, and all those at LucasFilm/LucasArts who made SCUMM the insane mess to reimplement that it is today. Feel free to drop us a line and tell us what you think, guys!",
+"\\C\\c0""",
+"\\C\\c0""",
 };
diff --git a/tools/credits.pl b/tools/credits.pl
index f220f80048..5f0431e44b 100755
--- a/tools/credits.pl
+++ b/tools/credits.pl
@@ -23,8 +23,13 @@ if ($Text::Wrap::VERSION < 2001.0929) {
 
 my $mode = "";
 my $max_name_width;
-my $indent;
-my $tab;
+
+# Count the level in the section hierarchy, i.e. how deep we are currently nested
+# in terms of 'sections'.
+my $section_level = 0;
+
+# Count how many sections there have been on this level already
+my @section_count = ( 0, 0, 0 );
 
 if ($#ARGV >= 0) {
 	$mode = "TEXT" if ($ARGV[0] eq "--text");	# AUTHORS file
@@ -46,8 +51,6 @@ $Text::Wrap::unexpand = 0;
 if ($mode eq "TEXT") {
 	$Text::Wrap::columns = 78;
 	$max_name_width = 21; # The maximal width of a name.
-	$indent = 7;
-	$tab = " " x $indent;
 } elsif ($mode eq "CPP") {
 	$Text::Wrap::columns = 48;	# Approx.
 }
@@ -88,6 +91,7 @@ sub html_entities_to_rtf {
 	
 	$text =~ s/&aacute;/\\'87/g;
 	$text =~ s/&eacute;/\\'8e/g;
+	$text =~ s/&oacute;/\\'97/g;
 	$text =~ s/&oslash;/\\'bf/g;
 	$text =~ s/&#322;/\\uc0\\u322 /g;
 
@@ -106,6 +110,7 @@ sub html_entities_to_tex {
 	
 	$text =~ s/&aacute;/\\'a/g;
 	$text =~ s/&eacute;/\\'e/g;
+	$text =~ s/&oacute;/\\'o/g;
 	$text =~ s/&oslash;/{\\o}/g;
 	$text =~ s/&#322;/{\\l}/g;
 
@@ -118,6 +123,23 @@ sub html_entities_to_tex {
 	return $text;
 }
 
+# 
+# Small reference of the RTF commands used here:
+#
+#  \fs28   switches to 14 point font (28 = 2 * 14)
+#  \pard   reset to default paragraph properties
+#
+#  \ql     left-aligned text
+#  \qr     right-aligned text
+#  \qc     centered text
+#  \qj     justified text
+#
+#  \b      turn on bold
+#  \b0     turn off bold
+#
+# For more information: <http://latex2rtf.sourceforge.net/rtfspec.html>
+#
+
 sub begin_credits {
 	my $title = shift;
 
@@ -126,11 +148,11 @@ sub begin_credits {
 	} elsif ($mode eq "TEX") {
 		print "% This file was generated by credits.pl. Do not edit by hand!\n";
 		print '\section{Credits}' . "\n";
-		print '\begin{itemize}' . "\n";
+		print '\begin{trivlist}' . "\n";
 	} elsif ($mode eq "RTF") {
 		print '{\rtf1\mac\ansicpg10000' . "\n";
 		print '{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}' . "\n";
-		print '{\colortbl;\red255\green255\blue255;\red0\green128\blue0;}' . "\n";
+		print '{\colortbl;\red255\green255\blue255;\red0\green128\blue0;\red128\green128\blue128;}' . "\n";
 		print '\vieww6920\viewh15480\viewkind0' . "\n";
 		print "\n";
 	} elsif ($mode eq "CPP") {
@@ -148,14 +170,13 @@ sub begin_credits {
 		print "  <tbody>\n";
 	} elsif ($mode eq "HTML") {
 		print "<!-- This file was generated by credits.pl. Do not edit by hand! -->\n";
-		print "<table border='0' cellpadding='5' cellspacing='0'>\n";
 	}
 }
 
 sub end_credits {
 	if ($mode eq "TEXT") {
 	} elsif ($mode eq "TEX") {
-		print '\end{itemize}' . "\n";
+		print '\end{trivlist}' . "\n";
 		print "\n";
 	} elsif ($mode eq "RTF") {
 		print "}\n";
@@ -167,51 +188,134 @@ sub end_credits {
 		print "  </informaltable>\n";
 		print "</appendix>\n";
 	} elsif ($mode eq "HTML") {
-		print "</table>\n";
+		print "\n";
 	}
 }
 
 sub begin_section {
 	my $title = shift;
+
 	if ($mode eq "TEXT") {
 		$title = html_entities_to_ascii($title);
-		print $title.":\n";
+
+		if ($section_level >= 2) {
+			$title .= ":"
+		}
+		
+		print "  " x $section_level . $title."\n";
+		if ($section_level eq 0) {
+			print "  " x $section_level . "*" x (length $title)."\n";
+		} elsif ($section_level eq 1) {
+			print "  " x $section_level . "-" x (length $title)."\n";
+		}
 	} elsif ($mode eq "TEX") {
-		print '\item \textbf{' . html_entities_to_tex($title) . "}\\\\\n";
-		print '  \begin{tabular}[h]{p{4cm}l}' . "\n";
+		print '\item \textbf{';
+		if ($section_level eq 0) {
+			print '\LARGE';
+		} elsif ($section_level eq 1) {
+			print '\large';
+		}
+		print " " . html_entities_to_tex($title) . "}\n";
+		print '\begin{list}{}{\setlength{\leftmargin}{0.2cm}}' . "\n";
 	} elsif ($mode eq "RTF") {
 		$title = html_entities_to_rtf($title);
 
 		# Center text
 		print '\pard\qc' . "\n";
-		print '\f0\b\fs28 \cf2 ' . $title . "\n";
+		print '\f0\b';
+		if ($section_level eq 0) {
+			print '\fs40 ';
+		} elsif ($section_level eq 1) {
+			print '\fs32 ';
+		}
+		
+		# Insert an empty line before this section header, *unless*
+		# this is the very first section header in the file.
+		if ($section_level > 0 || @section_count[0] > 0) {
+			print "\\\n";
+		}
+		print '\cf2 ' . $title . "\n";
 		print '\f1\b0\fs24 \cf0 \\' . "\n";
 	} elsif ($mode eq "CPP") {
-		$title = html_entities_to_ascii($title);
-		print '"\\\\C\\\\c1""'.$title.':",' . "\n";
+		if ($section_level eq 0) {
+		  # TODO: Would be nice to have a 'fat' or 'large' mode for 
+		  # headlines...
+		  $title = html_entities_to_ascii($title);
+		  print '"\\\\C\\\\c1""'.$title.'",' . "\n";
+		  print '"\\\\C\\\\c0""",' . "\n";
+		} else {
+		  $title = html_entities_to_ascii($title);
+		  print '"\\\\C\\\\c1""'.$title.'",' . "\n";
+		}
 	} elsif ($mode eq "XML") {
 		print "  <row><entry namest='start' nameend='job'>";
 		print "<emphasis role='bold'>" . $title . ":</emphasis>";
 		print "</entry></row>\n";
 	} elsif ($mode eq "HTML") {
-		print "<tr><td colspan=3><h2>$title:</h2></td></tr>\n";
-#		print "<tr><td colspan=3><?php html_subhead_start(\"$title\"); ?></td></tr>\n";
+		if ($section_level eq 0) {
+			print "<div class='par-item'><div class='par-head'>$title</div><div class='par-content'>&nbsp;\n";
+		} elsif ($section_level eq 1) {
+			print "<div class='par-subhead'>$title</div>\n";
+			print "<div class='par-subhead-dots'>&nbsp;</div>\n";
+			print "<div class='par-subhead-content'>\n"
+		} else {
+			print "<span style='font-weight: bold'>$title:</span>\n";
+		}
+	}
+
+	# Implicit start of person list on section level 2
+	if ($section_level >= 2) {
+		begin_persons();
 	}
+	@section_count[$section_level]++;
+	$section_level++;
+	@section_count[$section_level] = 0;
 }
 
 sub end_section {
+	$section_level--;
+
+	# Implicit end of person list on section level 2
+	if ($section_level >= 2) {
+		end_persons();
+	}
+
 	if ($mode eq "TEXT") {
-		print "\n";
+		# nothing
 	} elsif ($mode eq "TEX") {
-		print '  \end{tabular}' . "\n";
+		print '\end{list}' . "\n";
 	} elsif ($mode eq "RTF") {
-		print "\\\n";
+		# nothing
 	} elsif ($mode eq "CPP") {
-		print '"\\\\L\\\\c0""",' . "\n";
+		print '"\\\\C\\\\c0""",' . "\n";
 	} elsif ($mode eq "XML") {
 		print "  <row><entry namest='start' nameend='job'> </entry></row>\n\n";
 	} elsif ($mode eq "HTML") {
-		print "<tr><td colspan=3>&nbsp;</td></tr>\n";
+		if ($section_level eq 0) {
+			print "</div></div>\n";
+		} elsif ($section_level eq 1) {
+			print "</div>\n";
+		}
+	}
+}
+
+sub begin_persons {
+	if ($mode eq "HTML") {
+		print "<table style='margin-left:2em; margin-bottom: 1em'>\n";
+	} elsif ($mode eq "TEX") {
+		print '\item  \begin{tabular}[h]{p{4cm}l}' . "\n";
+	}
+}
+
+sub end_persons {
+	if ($mode eq "TEXT") {
+		print "\n";
+	} elsif ($mode eq "TEX") {
+		print '  \end{tabular}' . "\n";
+	} elsif ($mode eq "RTF") {
+		# nothing
+	} elsif ($mode eq "HTML") {
+		print "</table>\n";
 	}
 }
 
@@ -219,51 +323,56 @@ sub add_person {
 	my $name = shift;
 	my $nick = shift;
 	my $desc = shift;
+	my $tab;
 	
 	if ($mode eq "TEXT") {
 		$name = $nick if $name eq "";
 		$name = html_entities_to_ascii($name);
 		$desc = html_entities_to_ascii($desc);
 		
-		printf $tab."%-".$max_name_width.".".$max_name_width."s - ", $name;
+		$tab = " " x ($section_level * 2 + 1);
+		printf $tab."%-".$max_name_width.".".$max_name_width."s", $name;
 		
 		# Print desc wrapped
-		my $inner_indent = $indent + $max_name_width + 3;
-		my $multitab = " " x $inner_indent;
-		print substr(wrap($multitab, $multitab, $desc), $inner_indent)."\n"
+		if (length $desc > 0) {
+		  my $inner_indent = ($section_level * 2 + 1) + $max_name_width + 3;
+		  my $multitab = " " x $inner_indent;
+		  print " - " . substr(wrap($multitab, $multitab, $desc), $inner_indent);
+		}
+		print "\n";
 	} elsif ($mode eq "TEX") {
 		$name = $nick if $name eq "";
 		$name = html_entities_to_tex($name);
 		$desc = html_entities_to_tex($desc);
 
-		print "    $name & $desc\\\\\n";
+		print "    $name & \\textit{$desc}\\\\\n";
 	} elsif ($mode eq "RTF") {
 		$name = $nick if $name eq "";
 		$name = html_entities_to_rtf($name);
-		$desc = html_entities_to_rtf($desc);
 
-		# Left align name
-		print '\pard\ql\qnatural' . "\n";
+		# Center text
+		print '\pard\qc' . "\n";
+		# Activate 1.5 line spacing mode
+		print '\sl360\slmult1';
+		# The name
 		print $name . "\\\n";
-
-		# Left align description, with a left indention
-		print '\pard\li560\ql\qnatural' . "\n";
-		# Italics
-		print "\\i " . $desc . "\\i0\\\n";
+		# Description using italics
+		if (length $desc > 0) {
+			$desc = html_entities_to_rtf($desc);
+			print '\pard\qc' . "\n";
+			print "\\cf3\\i " . $desc . "\\i0\\cf0\\\n";
+		}
 	} elsif ($mode eq "CPP") {
 		$name = $nick if $name eq "";
 		$name = html_entities_to_ascii($name);
-		$desc = html_entities_to_ascii($desc);
 
-		print '"\\\\L\\\\c0""  '.$name.'",' . "\n";
+		print '"\\\\C\\\\c0""'.$name.'",' . "\n";
 
 		# Print desc wrapped
-		my $line_start = '"\\\\L\\\\c2""';
-		my $line_end = '",';
-		$Text::Wrap::separator = $line_end . "\n" .$line_start ;
-		print $line_start . wrap("    ", "    ", $desc) . $line_end . "\n";
-		$Text::Wrap::separator = "\n";
-
+		if (length $desc > 0) {
+			$desc = html_entities_to_ascii($desc);
+			print '"\\\\C\\\\c2""'.$desc.'",' . "\n";
+		}
 	} elsif ($mode eq "XML") {
 		$name = $nick if $name eq "";
 		print "  <row><entry namest='name'>" . $name . "</entry>";
@@ -271,33 +380,37 @@ sub add_person {
 	} elsif ($mode eq "HTML") {
 		$name = "???" if $name eq "";
 		print "<tr>";
-		print "<td>".$name."</td>";
+		print "<td style='width:13em; padding:2px;'>".$name."</td>";
 		if ($nick ne "") {
-			print "<td>[&nbsp;".$nick."&nbsp;]</td>";
+			print "<td style='width:10em; text-align: left;' class='news-author'>".$nick."</td>";
 		} else {
 			print "<td></td>";
 		}
 		print "<td>".$desc."</td>\n";
 	}
+
+
 }
 
 sub add_paragraph {
 	my $text = shift;
+	my $tab;
 	
 	if ($mode eq "TEXT") {
+		$tab = " " x ($section_level * 2 + 1);
 		print wrap($tab, $tab, html_entities_to_ascii($text))."\n";
 		print "\n";
 	} elsif ($mode eq "TEX") {
-		print "\n";
+		print '\item' . "\n";
 		print $text;
 		print "\n";
 	} elsif ($mode eq "RTF") {
-		# Left align text
-		print '\pard\ql\qnatural' . "\n";
-		print $text . "\\\n";
+		# Center text
+		print '\pard\qc' . "\n";
 		print "\\\n";
+		print $text . "\\\n";
 	} elsif ($mode eq "CPP") {
-		my $line_start = '"\\\\L\\\\c0""';
+		my $line_start = '"\\\\C\\\\c0""';
 		my $line_end = '",';
 		print $line_start . $text . $line_end . "\n";
 		print $line_start . $line_end . "\n";
@@ -305,10 +418,9 @@ sub add_paragraph {
 		print "  <row><entry namest='start' nameend='job'>" . $text . "</entry></row>\n";
 		print "  <row><entry namest='start' nameend='job'> </entry></row>\n\n";
 	} elsif ($mode eq "HTML") {
-		print '<tr><td colspan="3">';
+		print "<p style='margin-left:2em; margin-bottom: 1em'>";
 		print $text;
-		print '</td></tr>'."\n";
-		print '<tr><td colspan="3">&nbsp;</td></tr>'."\n";
+		print "</p>\n";
 	}
 }
 
@@ -319,94 +431,229 @@ sub add_paragraph {
 #
 
 begin_credits("Credits");
-  begin_section("The ScummVM team");
-	add_person('James Brown', 'endy', "Lead developer");
-	add_person('Max Horn', 'fingolfin', "Lead developer");
-	add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "Engine: SCUMM, Broken Sword 2, SAGA, Gob");
-	add_person("David Eriksson", "twogood", "Engine: Flight of the Amazon Queen");
-	add_person("Robert G&ouml;ffringmann", "lavosspawn", "Engine: Beneath a Steel Sky, Broken Sword 1");
-	add_person("Jonathan Gray", "khalek", "Engine: SCUMM, HE, Broken Sword 2");
-	add_person("Travis Howell", "Kirben", "Engine: SCUMM, HE, Simon the Sorcerer");
-	add_person("Oliver Kiehl", "olki", "Engine: Beneath a Steel Sky, Simon");
-	add_person("Pawe&#322; Ko&#322;odziejski", "aquadran", "Engine: SCUMM (Codecs, iMUSE, Smush, etc.)");
-	add_person("Andrew Kurushin", "ajax16384", "Engine: SAGA");
-	add_person("Gregory Montoir", "cyx", "Engine: Flight of the Amazon Queen, HE, Kyra");
-	add_person("Joost Peters", "joostp", "Engine: Beneath a Steel Sky, Flight of the Amazon Queen");
-	add_person("Eugene Sandulenko", "_sev", "Engine: SCUMM (FT INSANE), HE, SAGA, Gob");
-	add_person("Johannes Schickel", "LordHoto", "Engine: Kyra, GUI improvements");
-	add_person("Chris Apers", "chrilith ", "Port: PalmOS");
-	add_person("Nicolas Bacca", "arisme", "Port: PocketPC/WinCE");
-	add_person("Jurgen Braam", "SumthinWicked", "Port: EPOC/SymbianOS maintainer");
-	add_person("Marcus Comstedt", "", "Port: Dreamcast");
-	add_person("Hans-J&ouml;rg Frieden", "", "Port: AmigaOS 4");
-	add_person("Lars Persson", "AnotherGuest", "Port: EPOC/SymbianOS, ESDL");
-	add_person("Jerome Fisher", "KingGuppy", "MT-32 emulator");
-	add_person("Jochen Hoenicke", "hoenicke", "Speaker &amp; PCjr sound support, Adlib work");
+  begin_section("ScummVM Team");
+    begin_section("Project Leaders");
+	  begin_persons();
+		add_person('James Brown', 'ender', "");
+		add_person('Max Horn', 'Fingolfin', "This is a long desc. A really, really long long description. No I really mean *long* like in 'very long'!");
+	  end_persons();
+    end_section();
+
+
+    begin_section("Engine Teams");
+	  begin_section("SCUMM");
+		  add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "");
+		  add_person('James Brown', 'ender', "");
+		  add_person("Jonathan Gray", "khalek", "");
+		  add_person('Max Horn', 'Fingolfin', "");
+		  add_person("Travis Howell", "Kirben", "");
+		  add_person("Pawe&#322; Ko&#322;odziejski", "aquadran", "Codecs, iMUSE, Smush, etc.");
+		  add_person("Eugene Sandulenko", "sev", "FT INSANE");
+	  end_section();
+
+	  begin_section("HE");
+		  add_person("Jonathan Gray", "khalek", "");
+		  add_person("Travis Howell", "Kirben", "");
+		  add_person("Gregory Montoir", "cyx", "");
+		  add_person("Eugene Sandulenko", "sev", "");
+	  end_section();
+
+	  begin_section("BASS");	# Beneath a Steel Sky
+		  add_person("Robert G&ouml;ffringmann", "lavosspawn", "");
+		  add_person("Oliver Kiehl", "olki", "");
+		  add_person("Joost Peters", "joostp", "");
+	  end_section();
+
+	  begin_section("Broken Sword 1");
+		  add_person("Robert G&ouml;ffringmann", "lavosspawn", "");
+	  end_section();
+
+	  begin_section("Broken Sword 2");
+		  add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "");
+		  add_person("Jonathan Gray", "khalek", "");
+	  end_section();
+
+	  begin_section("FOTAQ");	# Flight of the Amazon Queen
+		  add_person("David Eriksson", "twogood", "");
+		  add_person("Gregory Montoir", "cyx", "");
+		  add_person("Joost Peters", "joostp", "");
+	  end_section();
+
+	  begin_section("Gob");
+		  add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "");
+		  add_person("Eugene Sandulenko", "sev", "");
+	  end_section();
+
+	  begin_section("Kyra");
+		  add_person("Gregory Montoir", "cyx", "");
+		  add_person("Johannes Schickel", "LordHoto", "");
+	  end_section();
+
+	  begin_section("SAGA");
+		  add_person("Torbj&ouml;rn Andersson", "eriktorbjorn", "");
+		  add_person("Andrew Kurushin", "ajax16384", "");
+		  add_person("Eugene Sandulenko", "sev", "");
+	  end_section();
+
+	  begin_section("Simon");
+		  add_person("Travis Howell", "Kirben", "");
+		  add_person("Oliver Kiehl", "olki", "");
+	  end_section();
+    end_section();
+
+
+    begin_section("Backend Teams");
+	  begin_section("Dreamcast");
+		  add_person("Marcus Comstedt", "", "");
+	  end_section();
+
+	  begin_section("SymbianOS");
+		  add_person("Jurgen Braam", "SumthinWicked", "");
+		  add_person("Lars Persson", "AnotherGuest", "");
+	  end_section();
+
+	  begin_section("PalmOS");
+		  add_person("Chris Apers", "chrilith ", "");
+	  end_section();
+
+	  begin_section("PocketPC / WinCE");
+		  add_person("Nicolas Bacca", "arisme", "");
+	  end_section();
+
+	  begin_section("Playstation 2");
+		  add_person("Robert G&ouml;ffringmann", "lavosspawn", "");
+	  end_section();
+
+	  begin_section("PSP (PlayStation Portable)");
+		  add_person("Joost Peters", "joostp", "");
+	  end_section();
+
+	  begin_section("SDL (Win/Linux/OS X/etc.)");
+		  add_person('Max Horn', 'Fingolfin', "");
+		  add_person('Random Name', '', "TODO: Add yourself if you feel it's appropriate");
+	  end_section();
+    end_section();
+
+    begin_section("Other subsystems");
+	  begin_persons();
+		add_person("Jerome Fisher", "KingGuppy", "MT-32 emulator");
+		add_person("Jochen Hoenicke", "hoenicke", "Speaker &amp; PCjr sound support, Adlib work");
+	  end_persons();
+    end_section();
+
+    begin_section("Website (content)");
+	  add_paragraph("All active team members");
+    end_section();
+
+    begin_section("Retired Team Members");
+	  begin_persons();
+		add_person("Ralph Brorsen", "painelf", "Help with GUI implementation");
+		add_person("Jamieson Christian", "jamieson630", "iMUSE, MIDI, all things musical");
+		add_person('Vincent Hamm', 'yazoo', "Co-Founder");
+		add_person("Ruediger Hanke", "", "Port: MorphOS");
+		add_person("Felix Jakschitsch", "yot", "Zak256 reverse engineering");
+		add_person("Mutwin Kraus", "mutle", "Original MacOS porter");
+		add_person("Peter Moraliyski", "ph0x", "Port: GP32");
+		add_person('Jeremy Newman', 'laxdragon', "Former webmaster");
+		add_person('Ludvig Strigeus', 'ludde', "Original ScummVM and SimonVM author");
+		add_person("Lionel Ulmer", "bbrox", "Port: X11");
+	  end_persons();
+    end_section();
   end_section();
 
 
-  begin_section("Retired Team Members");
-	add_person("Ralph Brorsen", "painelf", "Help with GUI implementation");
-	add_person("Jamieson Christian", "jamieson630", "iMUSE, MIDI, all things musical");
-	add_person('Vincent Hamm', 'yazoo', "Co-Founder");
-	add_person("Ruediger Hanke", "", "Port: MorphOS");
-	add_person("Felix Jakschitsch", "yot", "Zak256 reverse engineering");
-	add_person("Mutwin Kraus", "mutle", "Original MacOS porter");
-	add_person("Peter Moraliyski", "ph0x", "Port: GP32");
-	add_person('Jeremy Newman', 'laxdragon', "Former webmaster");
-	add_person('Ludvig Strigeus', 'ludde', "Original ScummVM and SimonVM author");
-	add_person("Lionel Ulmer", "bbrox", "Port: X11");
-  end_section();
-
+  begin_section("Other contributions");
+
+	begin_section("Packages");
+	  begin_section("AmigaOS 4");
+		  add_person("Hans-J&ouml;rg Frieden", "", "");
+		  add_person("Juha Niemim&auml;ki", "", "");
+	  end_section();
+
+	  begin_section("BeOS");
+		  add_person("Stefan Parviainen", "", "");
+	  end_section();
+
+	  begin_section("Debian GNU/Linux");
+		  add_person("Tore Anderson", "tore", "");
+	  end_section();
+
+	  begin_section("Fedora / RedHat");
+		  add_person("Willem Jan Palenstijn", "wjp", "");
+	  end_section();
+
+	  begin_section("Mac OS X");
+		  add_person('Max Horn', 'Fingolfin', "");
+	  end_section();
+
+	  begin_section("OS/2");
+		  add_person("Paul Smedley", "Creeping", "");
+	  end_section();
+
+	  begin_section("PocketPC 2002");
+		  add_person("Kostas Nakos", "knakos", '');
+	  end_section();
+
+	  begin_section("SlackWare");
+		  add_person("Robert Kelsen", "", "");
+	  end_section();
+
+	  begin_section("Win32");
+		  add_person("Travis Howell", "Kirben", "");
+	  end_section();
+
+	  begin_section("Win64");
+		  add_person("Chris Gray", "Psychoid", "");
+	  end_section();
+	end_section();
+
+	begin_section("Website (design)");
+	  begin_persons();
+		  add_person("Dob&oacute; Bal&aacute;zs", "draven", "Website design");
+		  add_person("Yaroslav Fedevych", "jafd", "HTML/CSS for the website");
+		  add_person("Jean Marc", "", 'ScummVM logo');
+	  end_persons();
+	end_section();
+
+	begin_section("Code contributions");
+	  begin_persons();
+		  add_person("Stuart Caie", "", "Decoders for Simon 1 Amiga data files");
+		  add_person("Janne Huttunen", "", "V3 actor mask support, Dig/FT SMUSH audio");
+		  add_person("Kov&aacute;cs Endre J&aacute;nos", "", "Several fixes for Simon1");
+		  add_person("Jeroen Janssen", "", "Numerous readability and bugfix patches");
+		  add_person("Andreas Karlsson", "Sprawl", "Initial port for EPOC/SymbianOS");
+		  add_person("Claudio Matsuoka", "", 'Daily Linux builds');
+		  add_person("Mikesch Nepomuk", "", "MI1 VGA floppy patches");
+		  add_person("Nicolas Noble", "pixels", "Config file and ALSA support");
+		  add_person("", "Quietust", "Sound support for Amiga SCUMM V2/V3 games, MM NES support");
+		  add_person("Andreas R&ouml;ver", "", "Broken Sword 1/2 MPEG2 cutscene support");
+		  add_person("Edward Rudd", "", "Fixes for playing MP3 versions of MI1/Loom audio");
+		  add_person("Daniel Schepler", "", "Final MI1 CD music support, initial Ogg Vorbis support");
+		  add_person("Andr&eacute; Souza", "", "SDL-based OpenGL renderer");
+		  add_person("Tim ???", "realmz", "Initial MI1 CD music support");
+	  end_persons();
+	end_section();
+
+    add_paragraph("And to all the contributors, users, and beta testers we've missed. Thanks!");
 
-  begin_section("Contributors");
-	add_person("Tore Anderson", "tore", "Packaging for Debian GNU/Linux");
-	add_person("Dob&oacute; Bal&aacute;zs", "draven", "Website design");
-	add_person("Stuart Caie", "", "Decoders for Simon 1 Amiga data files");
-	add_person("Yaroslav Fedevych", "jafd", "HTML/CSS for the website");
-	add_person("Chris Gray", "Psychoid", "Windows64 builds");
-	add_person("Janne Huttunen", "", "V3 actor mask support, Dig/FT SMUSH audio");
-	add_person("Kov&aacute;cs Endre J&aacute;nos", "", "Several fixes for Simon1");
-	add_person("Jeroen Janssen", "", "Numerous readability and bugfix patches");
-	add_person("Andreas Karlsson", "Sprawl", "Initial port for EPOC/SymbianOS");
-	add_person("Robert Kelsen", "", "Packaging for SlackWare");
-	add_person("Jean Marc", "", 'ScummVM logo');
-	add_person("Claudio Matsuoka", "", 'Daily Linux builds');
-	add_person("Kostas Nakos", "knakos", 'PocketPC 2002 builds');
-	add_person("Mikesch Nepomuk", "", "MI1 VGA floppy patches");
-	add_person("Juha Niemim&auml;ki", "", "AmigaOS 4 port maintaining");
-	add_person("Nicolas Noble", "pixels", "Config file and ALSA support");
-	add_person("Willem Jan Palenstijn", "wjp", "Packaging for Fedora/RedHat");
-	add_person("Stefan Parviainen", "", "Packaging for BeOS");
-	add_person("", "Quietust", "Sound support for Amiga SCUMM V2/V3 games, MM NES support");
-	add_person("Andreas R&ouml;ver", "", "Broken Sword 1/2 MPEG2 cutscene support");
-	add_person("Edward Rudd", "", "Fixes for playing MP3 versions of MI1/Loom audio");
-	add_person("Daniel Schepler", "", "Final MI1 CD music support, initial Ogg Vorbis support");
-	add_person("Paul Smedley", "Creeping", "OS/2 fixes and packaging");
-	add_person("Andr&eacute; Souza", "", "SDL-based OpenGL renderer");
-	add_person("Tim ???", "realmz", "Initial MI1 CD music support");
   end_section();
 
 
-  add_paragraph("And to all the contributors, users, and beta testers we've missed. Thanks!");
-
   # HACK!
   $max_name_width = 15;
 
   begin_section("Special thanks to");
-	add_person("Sander Buskens", "", "For his work on the initial reversing of Monkey2");
-	add_person("", "Canadacow", "For the original MT-32 emulator");
-	add_person("Kevin Carnes", "", "For Scumm16, the basis of ScummVM's older gfx codecs");
-	add_person("Ivan Dubrov", "", "For contributing the initial version of the Gobliiins engine");
-	add_person("", "Jezar", "For his freeverb filter implementation");
-	add_person("Jim Leiterman", "", "Various info on his FM-TOWNS/Marty SCUMM ports");
-	add_person("", "lloyd", "For deep tech details about C64 Zak &amp; MM");
-	add_person("Jimmi Th&oslash;gersen", "", "For ScummRev, and much obscure code/documentation");
-	add_person("", "Tristan", "For additional work on the original MT-32 emulator");
-  end_section();
-
-  # HACK!
-  $Text::Wrap::columns = 46 if $mode eq "CPP";
+    begin_persons();
+	  add_person("Sander Buskens", "", "For his work on the initial reversing of Monkey2");
+	  add_person("", "Canadacow", "For the original MT-32 emulator");
+	  add_person("Kevin Carnes", "", "For Scumm16, the basis of ScummVM's older gfx codecs");
+	  add_person("Ivan Dubrov", "", "For contributing the initial version of the Gobliiins engine");
+	  add_person("", "Jezar", "For his freeverb filter implementation");
+	  add_person("Jim Leiterman", "", "Various info on his FM-TOWNS/Marty SCUMM ports");
+	  add_person("", "lloyd", "For deep tech details about C64 Zak &amp; MM");
+	  add_person("Jimmi Th&oslash;gersen", "", "For ScummRev, and much obscure code/documentation");
+	  add_person("", "Tristan", "For additional work on the original MT-32 emulator");
+    end_persons();
 
   add_paragraph(
   "Tony Warriner and everyone at Revolution Software Ltd. for sharing ".
@@ -430,4 +677,6 @@ begin_credits("Credits");
   "that it is today. Feel free to drop us a line and tell us what you ".
   "think, guys!");
 
+  end_section();
+
 end_credits();
diff --git a/tools/module.mk b/tools/module.mk
index 570b421fea..58cd207965 100644
--- a/tools/module.mk
+++ b/tools/module.mk
@@ -43,6 +43,7 @@ credits:
 	$(srcdir)/tools/credits.pl --cpp > gui/credits.h
 	$(srcdir)/tools/credits.pl --xml > ../docs/docbook/credits.xml
 	$(srcdir)/tools/credits.pl --tex > doc/10.tex
+	$(srcdir)/tools/credits.pl --rtf > Credits.rtf
 
 md5scumm: tools/md5table$(EXEEXT)
 	tools/md5table$(EXEEXT) --c++ < $(srcdir)/tools/scumm-md5.txt > scumm/scumm-md5.h