diff --git a/themes/yaroon/jeroen2.theme b/themes/yaroon/jeroen2.theme
index 7e027285364..fff14603cd5 100644
--- a/themes/yaroon/jeroen2.theme
+++ b/themes/yaroon/jeroen2.theme
@@ -13,28 +13,41 @@
 
     function header() {
 
+    switch (rand(0,8)) {
+      case 0: $color = "#c4a2a2"; break;
+      case 1: $color = "#a2c4a7"; break;
+      case 2: $color = "#c2c4a2"; break;
+      case 3: $color = "#ad4322"; break;
+      case 4: $color = "#6c6c23"; break;
+      case 6: $color = "#d31717"; break;
+      case 7: $color = "#383838"; break;
+      default: $color = "#a3b1c7";
+    }
+
 ?>
 
-      <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+      <!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -->
       <html>
 
         <head>
           <title><?php echo variable_get(site_name, "drupal"); ?></title>
           <style type="text/css">
-          <!--
-            a { text-decoration: none; font-size: 12pt; color: #000000 }
-            a.active { color: #000000}
-            a.visited { color: #000000 }
-            a:hover { color: black}
-            td { font-family: Arial; font-size: 10pt }
-            .spacer1 { background-color: #000000 }
-          -->
+	  <!--
+	    a { text-decoration: none; color: #24677f }
+	    a.active { color: #24677f }
+	    a.visited { color: #24677f }
+	    a:hover { color: <?php echo $color; ?> }
+	    td { font-family: Arial; font-size: 10pt }
+	    .spacer1 { background-color: #000000 }
+            .small { font-family: Arial; font-size: 10pt }
+	    .box { font-size: 12pt }
+	  -->
           </style>
-          <script language="javascript">
+          <script language="JavaScript">
           <!--
             function do_nav() {
               if (document.navmenu.sitedrop.options[document.navmenu.sitedrop.selectedIndex].value != "none") {
-                location = document.navmenu.sitedrop.options[document.navmenu.sitedrop.selectedIndex].value
+                location = document.navmenu.sitedrop.options[document.navmenu.sitedrop.selectedIndex].value;
               }
             }
           -->
@@ -44,26 +57,25 @@
         <body bgcolor="#878787" topmargin="0" leftmargin="0" marginwidth="0" marginheight="0">
           <table border="0" cellpadding="0" cellspacing="0" width="100%">
             <tr>
-              <td align="left" valign="middle" colspan="2" width="20%" class="header">
+              <td align="left" valign="middle" width="20%" heigth="5%" class="header">
                 &nbsp;<b><a href="http://drop.org/">drop.org</a></b>
               </td>
+              <td class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /></td>
               <form name="navmenu" action="" method="get">
               <td align="right" valign="top" width="80%">
-                <select name="sitedrop" onChange="do_nav()">
-                  <option value="/" selected>Main</option>
-                  <option value="/account.php/">Account</option>
-                  <option value="/module.php?mod=diary/">Diary</option>
-                  <option value="/module.php?mod=handbook/">Handbook</option>
-                  <option value="/submit.php/">Submit news</option>
-                  <option value="/search/">Search</option>
+                <select name="sitedrop" onChange="do_nav()" class="small">
+                  <option value="index.php" selected>Main</option>
+                  <option value="account.php">Account</option>
+                  <option value="module.php?mod=diary">Diary</option>
+                  <option value="module.php?mod=book">Handbook</option>
+                  <option value="submit.php">Submit news</option>
+                  <option value="search">Search</option>
                 </select>
                 <noscript><input type="submit" value="Go!"></noscript>
               </td>
               </form>
             </tr>
-            <tr>
-              <td colspan="3" class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0"><br /></td>
-            </tr>
+            <tr><td colspan="3" class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /></td></tr>
             <tr>
               <td align="center" valign="top" width="20%">
                 <br />
@@ -76,8 +88,8 @@
 ?>
 
               </td>
-              <td class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0"><br /></td>
-              <td align="center" valign="top" bgcolor="#f4f4f4" width="80%">
+              <td class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /></td>
+              <td align="center" valign="top" bgcolor="#f4f4f4" width="80%" height="100%">
                 <br />
 
 <?php
@@ -99,16 +111,14 @@
 
 ?>
 
-                <table border="0" cellpadding="0" cellspacing="1" width="95%">
+                <table border="0" cellpadding="0" cellspacing="1" width="95%" height="100%">
                   <tr>
                     <td>
-                      <img src="themes/jeroen2/images/<?php echo $img; ?>">&nbsp;<b><?php echo check_output($story->title); ?></b>
-                      <?php echo strtr(t(" By %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp), "small")); ?>
+                      <a href="search.php?category=<?php echo urlencode($story->section); ?>"><img src="themes/jeroen2/images/<?php echo $img; ?>" border="0" /></a>&nbsp;<b style="font-size: 12pt"><?php echo check_output($story->title); ?></b>
+                      <?php echo strtr(t("by %a on %b"), array("%a" => format_username($story->userid), "%b" => format_date($story->timestamp), "small")); ?>
                     </td>
                   </tr>
-                  <tr>
-                    <td bgcolor="<?php echo $color; ?>"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0"><br /></td>
-                  </tr>
+                  <tr><td bgcolor="<?php echo $color; ?>"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /></td></tr>
                   <tr>
                     <td>
                       
@@ -140,25 +150,64 @@
 
     function comment($comment, $link = "") {
       echo "<a name=\"$comment->cid\"></a>\n";
+
+?>
+
+      <table width="90%" border="0" cellpadding="0" cellspacing="1" heigth="100%">
+        <tr>
+          <td class="box">
+            <img src="themes/jeroen2/images/square.gif" />&nbsp;<b><?php echo check_output($comment->subject); ?></b>
+	    <font size="-1"><?php echo strtr(t(" by %a on %b"), array("%a" => format_username($comment->userid), "%b" => format_date($comment->timestamp), "small")); ?></font>
+          </td>
+          <td align="right"><?php echo comment_moderation($comment); ?></td>
+        </tr>
+        <tr><td colspan="2" class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /><br></td></tr>
+        <tr>
+          <td>
+            <br />
+            <?php echo check_output($comment->comment, 1); ?>
+          </td>
+        </tr>
+        <tr>
+          <td align="right">
+            <br />
+            [ <?php echo $link; ?> ]<br />
+            &nbsp;
+          </td>
+        </tr>
+      </table>
+
+<?php
+
     } // close comment function
 
     function box($subject, $content, $options = "") {
 
+      switch (rand(0,7)) {
+        case 0: $img = "square.gif"; break;
+        case 1: $img = "square2.gif"; break;
+        case 2: $img = "square3.gif"; break;
+        case 3: $img = "square4.gif"; break;
+        case 4: $img = "square5.gif"; break;
+        case 6: $img = "square6.gif"; break;
+        case 7: $img = "square7.gif"; break;
+        default: $img = "square.gif";
+      }
+
 ?>
 
       <table width="90%" border="0" cellpadding="0" cellspacing="1">
         <tr>
-          <td><img src="themes/jeroen2/images/square.gif">&nbsp;<?php echo $subject; ?></td>
-        </tr>
-        <tr>
-         <td class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0"><br></td>
+	  <td class="box"><img src="themes/jeroen2/images/square.gif" />&nbsp;<b><?php echo $subject; ?></b></td>
         </tr>
+        <tr><td class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /><br></td></tr>
         <tr>
           <td>
+            <br />
             <?php echo $content; ?>
-            <br />&nbsp;
           </td>
         </tr>
+        <tr><td align="right" class="box"><img src="themes/jeroen2/images/<?php echo $img; ?>" /><br />&nbsp;</td></tr>
       </table>
 
 <?php
@@ -168,17 +217,18 @@
     function footer() {
 
 ?>
-
+              
+                &nbsp; <!-- I call this the super-space, withouth it, the comment section looks crappy at the bottom :) -->
               </td>
             </tr>
-            <tr>
-              <td colspan="3" class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0"><br /></td>
-            </tr>
+            <tr><td colspan="3" class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /></td></tr>
             <tr>
               <td align="left">
-                  &nbsp;Creator: <a href="mailto:jeroen@drop.org">Jeroen</a>
+                  &nbsp;<a href="mailto:info@drop.org">info@drop.org</a>
               </td>
+              <td class="spacer1"><img src="themes/jeroen2/images/pixel.gif" width="1" height="1" alt="" border="0" /></td>
               <td align="right">
+                The weblog for a dynamic community powered by Drupal&nbsp;
               </td>
             </tr>
           </table>
