diff --git a/www/Makefile b/www/Makefile
index 012fd091f9..b1a971a382 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -13,7 +13,7 @@ OBJS := $(SRC:%.t=%.html) $(SOBJS)
 %.shtml : %.t
 	$(ACTION) $<
 
-all: $(OBJS)
+all: $(OBJS) head.tmpl
 	@(cd schematics; $(MAKE))
 	@(cd docs; $(MAKE))
 	@(cd mods; $(MAKE))
@@ -30,6 +30,9 @@ all: $(OBJS)
 	@(cd screenshots; $(MAKE))
 	@(cd digest; $(MAKE))
 
+head.tmpl: head.t
+	$(ACTION) -DTWIKI $<
+
 main.html: main.t activity.html
 
 main.shtml: main.t activity.html
diff --git a/www/daily.t b/www/daily.t
index 57c3e8a27f..28e5cc156a 100644
--- a/www/daily.t
+++ b/www/daily.t
@@ -3,24 +3,16 @@
 
 <h2>Daily builds for different models</h2>
 
-<p>These are automated daily builds of the code in CVS. They contain all the latest features. They may also contain bugs and/or undocumented changes... :-)
-The top line is the latest.
+<p>These are automated daily builds of the code in CVS. They contain all the
+latest features. They may also contain bugs and/or undocumented changes... <a href="/docs/devicechart.html">identify your model</a>
 
 <p>
 <!--#exec cmd="./dailymod.pl" -->
-#if 0
-<p>
-<b>mod</b> - The file you should name "archos.mod" before copying it to the root of your archos.<br>
-<b>ajz</b> - The file you should name "ajbrec.ajz" before copying it to the root of your archos.<br>
-<b>rocks</b> - All plugins for this particular release of Rockbox.<br>
-<b>full</b> - Full zip archive, with rockbox, plugins, languages, docs, fonts, ucl etc.<br>
-<b>ucl</b> - File to use when <a href="/docs/flash.html">flashing Rockbox</a>
-#endif
 <h2>Source tarballs</h2>
 
 <!--#exec cmd="./dailysrc.pl" -->
 
-<p>Please also look at the <a href="docs/">documentation</a> for do-it-yourselfers.
+<p>Please also look at the <a href="/twiki/bin/view/Main/DocsIndex">documentation</a> for do-it-yourselfers.
 
 <a name="target_builds"></a>
 <a name="daily_builds"></a>
@@ -46,10 +38,6 @@ The batch timestamp is GMT.
 <a href="auto/build-playerdebug/archos.mod">Player debug</a>
 (<a href="auto/build-playerdebug/rocks.zip">rocks</a>)<br>
 
-<a href="auto/build-playersim/rockboxui">Player simulator (linux)</a>
-(<a href="auto/build-playersim/rocks.zip">rocks</a>)<br>
-<a href="auto/build-playersimwin32/uisw32.exe">Player simulator (win32)</a>
-(<a href="auto/build-playersimwin32/rocks.zip">rocks</a>)<br>
 </td>
 <td>
 <a href="auto/build-recorder/ajbrec.ajz">Recorder</a>
@@ -58,10 +46,9 @@ The batch timestamp is GMT.
 <a href="auto/build-recorderdebug/ajbrec.ajz">Recorder debug</a>
 (<a href="auto/build-recorderdebug/rocks.zip">rocks</a>)<br>
 
-<a href="auto/build-recordersim/rockboxui">Recorder simulator (linux)</a>
-(<a href="auto/build-recordersim/rocks.zip">rocks</a>)<br>
-<a href="auto/build-recordersimwin32/uisw32.exe">Recorder simulator (win32)</a>
-(<a href="auto/build-recordersimwin32/rocks.zip">rocks</a>)<br>
+<a href="auto/build-ondiosp/ajbrec.ajz">Ondio SP</a>
+<a href="auto/build-ondiofm/ajbrec.ajz">Ondio FM</a>
+
 </td>
 <td>
 <a href="auto/build-fmrecorder/ajbrec.ajz">FM Recorder</a>
@@ -74,6 +61,6 @@ The batch timestamp is GMT.
 </tr></table>
 
 <p>
-<a href="/cvs.html">How to use CVS</a>.
+<a href="/twiki/bin/view/Main/UsingCVS">How to use CVS</a>.
 
 #include "foot.t"
diff --git a/www/dailymod.pl b/www/dailymod.pl
index a02e6be1b8..eafbf0c979 100755
--- a/www/dailymod.pl
+++ b/www/dailymod.pl
@@ -1,13 +1,14 @@
 #!/usr/bin/perl
 
+require "rockbox.pm";
+
 my $basedir = "/home/dast/rockbox-build/daily-build";
 
-my @list=("player", "recorder", "fmrecorder", "recorderv2", "recorder8mb");
+my @list=("player", "recorder", "fmrecorder", "recorderv2", "recorder8mb", "fmrecorder8mb");
 
 for(@list) {
     my $dir = $_;
-    opendir(DIR, "$basedir/$dir") or
-        die "Can't opendir($basedir/$dir)";
+    opendir(DIR, "$basedir/$dir") or next;
     my @files = sort grep { /^rockbox/ } readdir(DIR);
     closedir DIR;
 
@@ -17,15 +18,11 @@ for(@list) {
     }
 }
 
-print "<table class=rockbox>\n";
-
-if (0) {
-    print "<tr><th>date</th>";
-
-    for(@list) {
-        print "<th>$_</th>";
-    }
-}
+$color1 = 0xc6;
+$color2 = 0xd6;
+$color3 = 0xf5;
+$font1 = "<b>";
+$font2 = "</b>";
 
 for(reverse sort keys %date) {
     my $d = $_;
@@ -33,21 +30,33 @@ for(reverse sort keys %date) {
     if($d =~ /(\d\d\d\d)(\d\d)(\d\d)/) {
         $nice = "$1-$2-$3";
     }
-    print "</tr>\n<tr><td>$nice</td>";
+    $col = sprintf("style=\"background-color: #%02x%02x%02x\"",
+                   $color1, $color2, $color3);
+    print "<h2>Download daily build</h2>\n";
+    print "<table class=rockbox><tr valign=top>\n";
+
+    $color1 -= 0x18;
+    $color2 -= 0x18;
+    $color3 -= 0x18;
     
     for(@list) {
         my $n=0;
         my $m = $_;
-        print "<td> ";
+        printf "<td $col>$font1$m$font2<br><img src=\"$model{$m}\"><br>";
         # new-style full zip:
         if( -f "daily/$m/rockbox-${m}-${d}.zip") {
-            printf "%s<a href=\"daily/$_/rockbox-${m}-${d}.zip\">${m}</a>",
+            printf "%s<a href=\"daily/$_/rockbox-${m}-${d}.zip\">latest</a>",
             $n?", ":"";
             $n++;
         }
-        print "</td>";
+        print "$font2 <p><a href=\"dl.cgi?bin=$_\">old versions</a></td>\n";
     }
-    print "</tr>\n"
+    printf "<td $col>${font1}windows installer$font2<br><img src=\"$model{install}\"><br>";
+    print "<a href=\"daily/Rockbox-${d}-install.exe\">latest</a>",
+    "<p><a href=\"dl.cgi?bin=install\">old versions</a></td>";
+    print "</tr>\n";
+    $font1 = $font2 = "";
+    last;
 }
 print "</table>\n";
 
diff --git a/www/dailysrc.pl b/www/dailysrc.pl
index d4e53ea922..1fa1f8ac22 100755
--- a/www/dailysrc.pl
+++ b/www/dailysrc.pl
@@ -20,6 +20,8 @@ for ( sort {$b <=> $a} @tarballs ) {
         }
     }
     print "<li><a href=\"daily/$_\">$_</a> <small>($size bytes)</small> $log\n";
+    print "<li><a href=\"dl.cgi?bin=source\">old versions</a>\n";
+    last;
 }
 
 print "</ul>\n";
diff --git a/www/irc/nicks.txt b/www/irc/nicks.txt
index 3c3d7c772e..257ead4397 100644
--- a/www/irc/nicks.txt
+++ b/www/irc/nicks.txt
@@ -25,3 +25,4 @@ Quelsaruk   => Jose Maria Garcia-Valdecasas Bernal
 amiconn     => Jens Arnold
 mattzz      => Matthias Wientapper
 pfavr       => Peter Favrholdt
+[av]bani    => Dan Hollis
diff --git a/www/style.css b/www/style.css
index b0e476a0b0..225be8d171 100644
--- a/www/style.css
+++ b/www/style.css
@@ -6,34 +6,39 @@ BODY {
 
 H1 {
  text-decoration:  none;
- font-family:      Verdana,Arial,Helvetica,sans-serif;
+ font-family:      sans-serif;
  font-style:       normal;
  font-weight:      bold;
- font-size:        20pt;
+ font-size:        150%;
 }
 
 H2 {
  text-decoration:  none;
- font-family:      Verdana,Arial,Helvetica,sans-serif;
+ font-family:      sans-serif;
  font-style:       normal;
  font-weight:      bold;
- font-size:        14pt;
+ font-size:        130%;
 }
 
 H3, div.h5, .newsdate {
  text-decoration:  none;
- font-family:      Verdana,Arial,Helvetica,sans-serif;
+ font-family:      sans-serif;
  font-style:       normal;
  font-weight:      bold;
- font-size:        12pt;
+ font-size:        110%;
 }
 
 BODY, P, DIV, TD, TH, TR, FORM, OL, UL, LI, INPUT, TEXTAREA, SELECT
 {
  text-decoration:  none;
- font-family:      Verdana,Arial,Helvetica,sans-serif;
+ font-family:      sans-serif;
  font-style:       normal;
- font-size:        10pt;
+# font-size:        95%;
+ font-size:        13px;
+}
+
+LI {
+ margin-top: 3px;
 }
 
 P.ind {