--- /Users/paddy/Desktop/spreadfirefox/nav.css	2006-06-14 09:27:51.000000000 +0200
+++ nav.css	2006-11-12 10:21:15.000000000 +0100
@@ -13,7 +13,7 @@
      padding: 0 0.5em 0.33em 6px;
      }
 #block-user-1 h2:before {
-     line-height: 0.1;
+     line-height: 0.1em;
      font-size: 1px;
      background: transparent url(images/menu_tr.gif) no-repeat top right;
      margin: 0;
@@ -25,7 +25,7 @@
      display: block;
      clear: both;
      padding-top: 0;
-     line-height: 0.1;
+     line-height: 0.1em;
      font-size: 1px;
      content:  url(images/key-point_bl.gif);
      margin: 0;
@@ -56,6 +56,9 @@
 .block-user .menu li.expanded {
     background: url(images/icons_expanded.png) 0px 6px no-repeat;
     }
+.block-user .menu li.expanded a {
+    margin-bottom: 2px;
+    }
 .block-user .menu li.leaf {
     background: url(images/icons_leaf.png) 0px 6px no-repeat;
     }
--- /Users/paddy/Desktop/spreadfirefox/node.tpl.php	2005-02-23 04:42:42.000000000 +0100
+++ node.tpl.php	2006-11-12 10:01:25.000000000 +0100
@@ -4,7 +4,7 @@
   <?php endif; ?>
   <?php print $picture ?>
 
-  <div class="info"><?php print $submitted .'<span class="taxonomy">'. ($submitted ? ' :: ' : '') . $terms .'</span>' ?></div>
+  <div class="info"><?php print $submitted .'<div class="taxonomy">'. ($submitted ? ' :: ' : '') . $terms .'</div>' ?></div>
   <div class="content">
   <?php print $content ?>
   </div>
--- /Users/paddy/Desktop/spreadfirefox/page.tpl.php	2006-06-12 11:01:08.000000000 +0200
+++ page.tpl.php	2006-11-12 09:55:08.000000000 +0100
@@ -3,13 +3,16 @@
 <html lang="<?php print $language ?>" xml:lang="<?php print $language ?>" xmlns="http://www.w3.org/1999/xhtml">
 <head>
  <title><?php print $head_title ?></title>
-   <?php 
-    print $head;
-    print theme('stylesheet_import', base_path() . path_to_theme() ."/modules.css");
-    print theme('stylesheet_import', base_path() . path_to_theme() ."/nav.css");
-    print theme('stylesheet_import', base_path() . path_to_theme() ."/layout.css");
-    print $styles;
-  ?>
+ <?php print $head ?>
+ <style type="text/css" media="screen">
+  <!--
+   @import url(<?php print path_to_theme()."/modules.css"; ?>);
+   @import url(<?php print path_to_theme()."/nav.css"; ?>);
+   @import url(<?php print path_to_theme()."/layout.css"; ?>);
+  -->
+ </style>
+ <?php print $scripts ?>
+ <?php print $styles ?>
  <!--[if lte IE 6]>
  <style type="text/css" media="screen">
    /* IE min-width trick */
@@ -39,23 +42,14 @@
     
     <div id ="region_header"><?php print $header ?></div>
     
-    <?php if (module_exist('banner')) : ?>
+    <?php if (module_exists('banner')) : ?>
      <div id="banner"><?php print banner_display() ?></div>
     <?php endif; ?>
 
     <?php if ($primary_links) : ?>
-     <ul id="primary">
-      <?php foreach (array_reverse($primary_links) as $link): ?>
-       <li><?php print $link; ?></li>
-      <?php endforeach; ?>
-     </ul>
-
+      <?php print theme('links', $primary_links, array('class' => 'primary-links')) ?>
     <?php elseif ($secondary_links) : ?>
-     <ul id="secondary">
-      <?php foreach (array_reverse($secondary_links) as $link): ?>
-       <li><?php print $link; ?></li>
-      <?php endforeach; ?>
-     </ul>
+      <?php print theme('links', array_reverse($secondary_links), array('class' => 'secondary-links')) ?>
     <?php endif; ?>
 
     <?php if ($search_box) : ?>
--- /Users/paddy/Desktop/spreadfirefox/style.css	2006-07-01 11:36:29.000000000 +0200
+++ style.css	2006-11-12 10:26:40.000000000 +0100
@@ -459,6 +459,9 @@
   color: #777;
   background-color: transparent;
 }
+.main-content .node .info .taxonomy {
+  display: inline;
+}
 .main-content .node .links, .main-content .comment .links {
   padding: 5px 0;
   margin: 1em 8px;
@@ -744,6 +747,10 @@
 form label:hover, form .form-item label {
   color: #333; 
   cursor: pointer;
+  border-bottom: 1px solid #fff;
+}
+form fieldset .form-item label {
+  border-bottom: 1px solid #f7f7f7;
 }
 form label:hover {
   color: #039;

