diff -u -p sandsold/icons.css sands/icons.css
--- sandsold/icons.css	2006-06-19 11:02:38.000000000 +0200
+++ sands/icons.css	2007-03-24 22:13:32.000000000 +0100
@@ -1,7 +1,7 @@
 /* vim: set et ts=2 sw=2: */
 .icon-add-comment,
 .icon-comment,
-a.read-more,
+a.node_read_more,
 .icon-print,
 .icon-add-child-page,
 .book .prev a,
@@ -38,7 +38,7 @@ a.read-more,
 
 .icon-add-comment { background-image: url("icons/comment_add.png"); }
 .icon-comment { background-image: url("icons/comment.png"); }
-a.read-more { background-image: url("icons/page_white_go.png"); }
+a.node_read_more { background-image: url("icons/page_white_go.png"); }
 .icon-print { background-image: url("icons/printer.png"); }
 .icon-add-child-page { background-image: url("icons/page_white_add.png"); }
 .icon-calendar { background-image: url("icons/calendar.png"); }
diff -u -p sandsold/layout.css sands/layout.css
--- sandsold/layout.css	2006-08-03 03:01:50.000000000 +0200
+++ sands/layout.css	2007-03-24 22:07:21.000000000 +0100
@@ -106,6 +106,7 @@ label {
 #primary
 {
   padding-top: 0.5ex;
+    font-size: 1.0em;
 }
 
 #header #menu a:link,
@@ -138,6 +139,7 @@ label {
 }
 #search .form-submit {
   height: 1.5em;
+  margin: 0 0 0.4em 0;
 }
 
 .site-name {
@@ -501,3 +503,10 @@ ul.menu li.leaf a
 textarea {
   font-size: 1em;
 }
+
+ul.links li {
+  border-left: 1px solid #9cf;
+}
+ul.links li.first {
+  border: none;
+}
diff -u -p sandsold/page.tpl.php sands/page.tpl.php
--- sandsold/page.tpl.php	2006-06-20 03:01:54.000000000 +0200
+++ sands/page.tpl.php	2007-03-24 22:07:21.000000000 +0100
@@ -5,6 +5,7 @@
   <title><?php print $head_title ?></title>
   <?php print $head ?>
   <?php print $styles ?>
+  <?php print $scripts ?>
   <script type="text/javascript"><?php /* Needed to avoid Flash of Unstyle Content in IE */ ?> </script>
 </head>
 
@@ -25,8 +26,12 @@
       </table>
     </td>
     <td id="menu">
-      <?php if ($secondary_links) { ?><div id="secondary"><?php print theme('links',$secondary_links) ?></div><?php } ?>
-      <?php if ($primary_links) { ?><div id="primary"><?php print theme('links',$primary_links) ?></div><?php } ?>
+
+<?php if (isset($secondary_links)) { ?><?php print theme('links', $secondary_links, array('class' =>'links', 'id' => 'secondary')) ?><?php } ?>
+
+<?php if (isset($primary_links)) { ?><?php print theme('links', $primary_links, array('class' =>'links', 'id' => 'primary')) ?><?php } ?>
+
+
       <?php if ($search_box) { print $search_box; } ?>
     </td>
   </tr>
@@ -50,6 +55,7 @@
         <?php print $messages ?>
 
         <?php print $content; ?>
+	<?php if ($feed_icons) { print "&nbsp;". $feed_icons; } ?>
       </div>
       <div class="clear"></div>
     </td>
diff -u -p sandsold/template.php sands/template.php
--- sandsold/template.php	2006-04-07 00:13:42.000000000 +0200
+++ sands/template.php	2007-03-24 22:07:21.000000000 +0100
@@ -4,41 +4,6 @@ function sands_breadcrumb($breadcrumb)
   return implode(' &raquo; ', $breadcrumb);
 }
 
-function sands_links($links, $delimiter = ' &bull;&nbsp;')
-{
-  if (!is_array($links)) {
-    return '';
-  }
-
-  /* Maps a link to it's associated class */
-  $link_to_id = array(
-    t('edit') => 'edit',
-    t('delete') => 'delete',
-    t('Add a new comment to this page') => 'add-comment',
-    t('Share your thoughts and opinions related to this posting') => 'add-comment',
-    t('Jump to the first comment') => 'comment',
-    t('reply') => 'reply',
-    //t('read more') => 'read-more',
-    t('printer-friendly version') => 'print',
-    t('add child page') => 'add-child-page',
-    t('calendar') => 'calendar',
-  );
-
-  $new_links = array();
-
-  foreach ($links as $link) {
-    foreach ($link_to_id as $text => $id) {
-      if (strpos($link, $text)) {
-        $link = str_replace('<a ', "<a class=\"icon-$id\" ", $link);
-        break;
-      }
-    }
-    $new_links[] = $link;
-  }
-
-  return implode($delimiter, $new_links);
-}
-
 function sands_regions()
 {
   return array(