diff -rN -up ./comment.tpl.php /tmp/golden_hour/comment.tpl.php
--- ./comment.tpl.php	2007-04-09 21:50:46.000000000 -0400
+++ /tmp/golden_hour/comment.tpl.php	2009-01-13 13:44:06.000000000 -0300
@@ -5,5 +5,10 @@
   <div class="commentTitle"><?php print $title; ?></div>
     <div class="submitted"><?php print t('By ') . theme('username', $comment) . t(' - Posted on ') . format_date($comment->timestamp, 'custom', "F jS, Y"); ?></div> 
     <div class="commentContent"><?php print $content; ?></div>
+      <?php if ($signature): ?>
+          <div class="user-signature clear-block">
+          <?php print $signature ?>
+          </div>
+      <?php endif; ?>
     <div class="links"> <?php print $links; ?></div>
   </div>
diff -rN -up ./contentpage.tpl.php /tmp/golden_hour/contentpage.tpl.php
--- ./contentpage.tpl.php	1969-12-31 21:00:00.000000000 -0300
+++ /tmp/golden_hour/contentpage.tpl.php	2009-01-13 13:44:06.000000000 -0300
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language ?>" xml:lang="<?php print $language ?>">
+
+<head>
+  <title><?php print $head_title ?></title>
+  <?php print $head ?>
+  <?php print $styles ?>
+  <?php print $scripts ?>
+</head>
+
+<body>
+
+	<!--Content-->
+	<div id="content">
+
+	<?php print $content; ?>
+
+	</div><!-- End of Content -->
+
+
+</body>
+</html>
diff -rN -up ./golden_hour.info /tmp/golden_hour/golden_hour.info
--- ./golden_hour.info	1969-12-31 21:00:00.000000000 -0300
+++ /tmp/golden_hour/golden_hour.info	2009-01-13 13:44:06.000000000 -0300
@@ -0,0 +1,21 @@
+; $Id:  $
+
+name = Golden Hour
+description = Golden Hour Theme`
+core = 6.x
+engine = phptemplate
+stylesheets[all][] = style.css
+stylesheets[all][] = icons.css
+regions[sidebar_left] = left sidebar
+regions[content_top] = content top
+regions[content_bottom] = content bottom
+features[] = logo
+features[] = name
+features[] = slogan
+features[] = mission
+features[] = node_user_picture
+features[] = comment_user_picture
+features[] = search
+features[] = favicon
+features[] = primary_links
+
Binary files ./.items_listed.txt.swp and /tmp/golden_hour/.items_listed.txt.swp differ
diff -rN -up ./page.tpl.php /tmp/golden_hour/page.tpl.php
--- ./page.tpl.php	2007-04-09 21:50:33.000000000 -0400
+++ /tmp/golden_hour/page.tpl.php	2009-01-13 13:44:06.000000000 -0300
@@ -1,5 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language ?>" xml:lang="<?php print $language ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language->language ?>" xml:lang="<?php print $language->language ?>">
+
 
 <head>
   <title><?php print $head_title ?></title>
@@ -41,8 +42,9 @@
 
 	<!--Menu -->
 	<div id="menu">
-	  <?php print theme('menu_links', $primary_links) ?> 
+	  <?php print golden_hour_menu_links($primary_links) ?> 
 	</div><!-- End of Menu -->
+  <div id="forsimplemenu"></div>
 
 	<!--Content-->
 	<div id="content" style="width: <?php print golden_hour_get_primaryContent_width($sidebar_left) ?>%;">
diff -rN -up ./template.php /tmp/golden_hour/template.php
--- ./template.php	2007-04-09 21:50:46.000000000 -0400
+++ /tmp/golden_hour/template.php	2009-01-13 13:44:06.000000000 -0300
@@ -61,7 +61,7 @@ function golden_hour_links($links, $attr
       $link['fragment'] = isset($link['fragment']) ? $link['fragment'] : NULL;
 
       if (isset($link['href'])) {
-        $output .= l($link['title'], $link['href'], $link['attributes'], $link['query'], $link['fragment'], FALSE, $html);
+        $output .= l($link['title'], $link['href'], array('attributes' => $link['attributes'], 'query' =>$link['query'], 'fragment' => $link['fragment'], 'absolute' => FALSE, 'html' => $html));
       }
       else if ($link['title']) {
         //Some links are actually not links, but we wrap these in <span> for adding title and class attributes
@@ -79,3 +79,36 @@ function golden_hour_links($links, $attr
 
   return $output;
 }
+
+
+
+/**
+ * Returns the themed HTML for primary and secondary links.
+ * From drupal5 menu.inc
+ *
+ * @param $links
+ *   An array containing links to render.
+ * @return
+ *   A string containing the themed links.
+ *
+ * @ingroup themeable
+ */
+function golden_hour_menu_links($links) {
+  if (!count($links)) {
+    return '';
+  }
+  $level_tmp = explode('-', key($links));
+  $level = $level_tmp[0];
+  $output = "<ul class=\"links-$level\">\n";
+  foreach ($links as $index => $link) {
+    $output .= '<li';
+    if (stristr($index, 'active')) {
+      $output .= ' class="active"';
+    }
+    $output .= ">". l($link['title'], $link['href'], array('attributes'=> array($link['attributes'], 'query'=>$link['query'], 'fragment'=> $link['fragment']))) ."</li>\n";
+  }
+  $output .= '</ul>';
+
+  return $output;
+}
+