diff --git a/index.cgi b/index.cgi
index 01b2cb0..fad6ad8 100755
--- a/index.cgi
+++ b/index.cgi
@@ -17,8 +17,8 @@ TUWF::register(
   qr{tuwf}          => \&tuwf,
   qr{tuwf/man(?:/(db|misc|request|response|xml))?}
                     => \&tuwfmanual,
-  qr{demo}          => \&demo,
   qr{dump}          => \&dump,
+  qr{demo}          => \&dumpdemo,
   qr{dump/awshrink} => \&dumpawshrink,
   qr{dump/grenamr}  => \&dumpgrenamr,
 );
@@ -260,50 +260,6 @@ sub tuwfmanual {
 
 
 
-#    D E M O S
-
-sub demo {
-  my $s = shift;
-  $s->htmlHeader(title => 'Demos', page => 'demo');
-  p;
-   lit <<'   E;';
-    Yes, I realise that the title is plural, suggesting there's more than one demo. That is
-    not quite true, unfortunately. The reason I chose to use plural form is simply in the
-    hopes that I do, in fact, write more demos, and that this page will actually get more
-    content in the future. I still happen to be a huge fan of the <a href="http://demoscene.info/">
-    demoscene</a>, and still wish to contribute to it... if only I could find the time and
-    self-discipline to do so. In the meanwhile, here's one demo I did write some time ago:
-   E;
-  end;
-
-  h2 'Blue Cubes';
-  img src => '/img/bluecubes.png', style => 'float: right', alt => 'Blue Cubes';
-  p;
-   lit <<'   E;';
-    August 2006. My first demo - or more exact: intro. Blue Cubes is a 64kB intro written in
-    OpenGL/SDL with Linux as target OS. I wrote this intro within 10 days without any prior
-    experience in any of the fields of computer generated graphics or music. So needlessly to
-    say, it sucks. I am ashamed even of the thought of releasing it at a respectable demoparty
-    like <a href="http://www.evoke.eu/2006/">Evoke</a>. Still, it didn't feel I was unwelcome,
-    I did actually receive three prices: 3rd price in the 64k competition (there were only 3
-    actual entries, but oh well), best non-windows 64k intro (it was the only one in the
-    competition), and the Digitale Kultur newcomer award, which actually is something to be
-    proud of, I guess.
-   E;
-   br; br;
-   a href => '/download/yorhel~bluecubes.zip', 'download';
-    txt ' - ';
-    a href => 'http://scene.org/file.php?file=/parties/2006/evoke06/in64/yorhel_bluecubes.zip&fileinfo', 'mirror';
-    txt " (includes linux binaries, windows port, and sources)"; br;
-   a href => 'http://pouet.net/prod.php?which=25866', 'pouet'; txt ' - ';
-   a href => 'http://demoscene.tv/page.php?id=172&lang=uk&vsmaction=view_prod&id_prod=12653', 'demoscene.tv'; txt ' - ';
-   a href => 'http://demozoo.org/productions/32253', 'demozoo';
-  end;
-  $s->htmlFooter;
-}
-
-
-
 
 #    C O D E   D U M P
 
@@ -377,6 +333,47 @@ sub dump {
 }
 
 
+sub dumpdemo {
+  my $s = shift;
+  $s->htmlHeader(title => 'Demos', page => 'dump', tab => 'demo');
+  p;
+   lit <<'   E;';
+    Yes, I realise that the title is plural, suggesting there's more than one demo. That is
+    not quite true, unfortunately. The reason I chose to use plural form is simply in the
+    hopes that I do, in fact, write more demos, and that this page will actually get more
+    content in the future. I still happen to be a huge fan of the <a href="http://demoscene.info/">
+    demoscene</a>, and still wish to contribute to it... if only I could find the time and
+    self-discipline to do so. In the meanwhile, here's one demo I did write some time ago:
+   E;
+  end;
+
+  h2 'Blue Cubes';
+  img src => '/img/bluecubes.png', style => 'float: right', alt => 'Blue Cubes';
+  p;
+   lit <<'   E;';
+    August 2006. My first demo - or more exact: intro. Blue Cubes is a 64kB intro written in
+    OpenGL/SDL with Linux as target OS. I wrote this intro within 10 days without any prior
+    experience in any of the fields of computer generated graphics or music. So needlessly to
+    say, it sucks. I am ashamed even of the thought of releasing it at a respectable demoparty
+    like <a href="http://www.evoke.eu/2006/">Evoke</a>. Still, it didn't feel I was unwelcome,
+    I did actually receive three prices: 3rd price in the 64k competition (there were only 3
+    actual entries, but oh well), best non-windows 64k intro (it was the only one in the
+    competition), and the Digitale Kultur newcomer award, which actually is something to be
+    proud of, I guess.
+   E;
+   br; br;
+   a href => '/download/yorhel~bluecubes.zip', 'download';
+    txt ' - ';
+    a href => 'http://scene.org/file.php?file=/parties/2006/evoke06/in64/yorhel_bluecubes.zip&fileinfo', 'mirror';
+    txt " (includes linux binaries, windows port, and sources)"; br;
+   a href => 'http://pouet.net/prod.php?which=25866', 'pouet'; txt ' - ';
+   a href => 'http://demoscene.tv/page.php?id=172&lang=uk&vsmaction=view_prod&id_prod=12653', 'demoscene.tv'; txt ' - ';
+   a href => 'http://demozoo.org/productions/32253', 'demozoo';
+  end;
+  $s->htmlFooter;
+}
+
+
 sub dumpawshrink {
   my $s = shift;
   $s->htmlHeader(title => 'AWStats data file shrinker', page => 'dump', tab => 'awshrink');
@@ -573,7 +570,6 @@ sub htmlHeader {
      a href => '/',     !$o{page}          ? (class => 'sel') : (), 'home'; txt ' ';
      a href => '/ncdu', $o{page} eq 'ncdu' ? (class => 'sel') : (), 'ncdu'; txt ' ';
      a href => '/tuwf', $o{page} eq 'tuwf' ? (class => 'sel') : (), 'tuwf'; txt ' ';
-     a href => '/demo', $o{page} eq 'demo' ? (class => 'sel') : (), 'demos'; txt ' ';
      a href => '/dump', $o{page} eq 'dump' ? (class => 'sel') : (), 'code dump';
     end;
     if($o{page} eq 'ncdu') {
@@ -593,6 +589,7 @@ sub htmlHeader {
     if($o{page} eq 'dump') {
       div id => 'mtabs';
        a href => '/dump',          !$o{tab}              ? (class => 'sel') : (), 'misc'; txt ' ';
+       a href => '/demo',          $o{tab} eq 'demo'     ? (class => 'sel') : (), 'demos'; txt ' ';
        a href => '/dump/awshrink', $o{tab} eq 'awshrink' ? (class => 'sel') : (), 'awshrink'; txt ' ';
        a href => '/dump/grenamr',  $o{tab} eq 'grenamr'  ? (class => 'sel') : (), 'grenamr';
       end;