diff -upr bluemarine.orig/block.tpl.php bluemarine/block.tpl.php
--- bluemarine.orig/block.tpl.php	2009-03-11 11:35:44.000000000 -0400
+++ bluemarine/block.tpl.php	2010-11-21 13:24:02.000000000 -0500
@@ -3,5 +3,5 @@
 ?>
   <div class="block block-<?php print $block->module; ?>" id="block-<?php print $block->module; ?>-<?php print $block->delta; ?>">
     <h2 class="title"><?php print $block->subject; ?></h2>
-    <div class="content"><?php print $block->content; ?></div>
+    <div class="content"><?php print $content; ?></div>
  </div>
diff -upr bluemarine.orig/bluemarine.info bluemarine/bluemarine.info
--- bluemarine.orig/bluemarine.info	2010-07-11 03:32:49.000000000 -0400
+++ bluemarine/bluemarine.info	2010-11-21 13:24:29.000000000 -0500
@@ -10,3 +10,4 @@ core = "7.x"
 project = "bluemarine"
 datestamp = "1278833569"
 
+stylesheets[all][] = style.css
Only in bluemarine.orig: box.tpl.php
diff -upr bluemarine.orig/comment.tpl.php bluemarine/comment.tpl.php
--- bluemarine.orig/comment.tpl.php	2009-03-11 11:35:44.000000000 -0400
+++ bluemarine/comment.tpl.php	2010-11-21 16:44:28.000000000 -0500
@@ -1,20 +1,20 @@
 <?php
 // $Id: comment.tpl.php,v 1.2 2009/03/11 15:35:44 johnalbin Exp $
 ?>
-  <div class="comment<?php print ' ' . $status; ?>">
-    <?php if ($picture) {
-    print $picture;
-  } ?>
-<h3 class="title"><?php print $title; ?></h3><?php if ($new != '') { ?><span class="new"><?php print $new; ?></span><?php } ?>
+  <div class="<?php print $classes . ' ' . $zebra; ?>"<?php print $attributes; ?>>
+    <?php print $picture; ?>
+<?php print render($title_prefix); ?>
+    <h3<?php print $title_attributes; ?>><?php print $title ?></h3>
+    <?php print render($title_suffix); ?>
     <div class="submitted"><?php print $submitted; ?></div>
-    <div class="content">
-     <?php print $content; ?>
-     <?php if ($signature): ?>
+    <div class="content"<?php print $content_attributes; ?>>
+      <?php hide($content['links']); print render($content); ?>
+      <?php if ($signature): ?>
       <div class="clearfix">
-       <div>—</div>
-       <?php print $signature ?>
+        <div>—</div>
+        <?php print $signature ?>
       </div>
-     <?php endif; ?>
+      <?php endif; ?>
     </div>
-    <div class="links">&raquo; <?php print $links; ?></div>
+    <div class="links"><?php if(count($content['links']['comment']['#links'])>0){print "&raquo";} print render($content['links']); ?></div>
   </div>
diff -upr bluemarine.orig/node.tpl.php bluemarine/node.tpl.php
--- bluemarine.orig/node.tpl.php	2009-03-11 11:35:44.000000000 -0400
+++ bluemarine/node.tpl.php	2010-11-22 20:20:34.000000000 -0500
@@ -3,12 +3,18 @@
 ?>
   <div class="node<?php if ($sticky) { print " sticky"; } ?><?php if (!$status) { print " node-unpublished"; } ?>">
     <?php if ($picture) {
-      print $picture;
+      print $user_picture;
     }?>
     <?php if ($page == 0) { ?><h2 class="title"><a href="<?php print $node_url?>"><?php print $title?></a></h2><?php }; ?>
-    <span class="submitted"><?php print $submitted?></span>
-    <div class="taxonomy"><?php print $terms?></div>
-    <div class="content"><?php print $content?></div>
-    <?php if ($links) { ?><div class="links">&raquo; <?php print $links?></div><?php }; ?>
-    <?php print $comments; ?>
+    <span class="submitted"><?php print $date; ?> - <?php print $name; ?></span>
+    <div class="content"<?php print $content_attributes; ?>><?php
+      // We hide the comments and links now so that we can render them later.
+      hide($content['comments']);
+      hide($content['links']);
+      print render($content);
+    ?></div>
+    <?php if (!empty($content['links'])): ?>
+      <div class="links"><?php if(count($content['links']['#links'])>0){print "&raquo";} print render($content['links']); ?></div>
+    <?php endif; ?>
+    <?php print render($content['comments']); ?>
   </div>
diff -upr bluemarine.orig/page.tpl.php bluemarine/page.tpl.php
--- bluemarine.orig/page.tpl.php	2009-03-11 11:35:44.000000000 -0400
+++ bluemarine/page.tpl.php	2010-11-22 18:57:36.000000000 -0500
@@ -1,55 +1,51 @@
 <?php
 // $Id: page.tpl.php,v 1.8 2009/03/11 15:35:44 johnalbin Exp $
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>"
-  <?php print $rdf_namespaces ?>>
-<head profile="<?php print $grddl_profile ?>">
-  <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>
-
-<body class="<?php print $body_classes; ?>">
+?>
   <div id="header" class="clearfix">
-    <?php if ($search_box) { ?><div class="search-box"><?php print $search_box ?></div><?php }; ?>
     <?php if ($logo) { ?><a class="logo" href="<?php print $front_page ?>" title="<?php print t('Home') ?>"><img src="<?php print $logo ?>" alt="<?php print t('Home') ?>" /></a><?php } ?>
     <?php if ($site_name) { ?><h1 class='site-name'><a href="<?php print $front_page ?>" title="<?php print t('Home') ?>"><?php print $site_name ?></a></h1><?php }; ?>
     <?php if ($site_slogan) { ?><div class='site-slogan'><?php print $site_slogan ?></div><?php } ?>
 
     <div id="menu">
-      <?php if (isset($secondary_menu)) { ?><?php print theme('links', $secondary_menu, array('class' => 'links', 'id' => 'subnavlist')); ?><?php } ?>
-      <?php if (isset($main_menu)) { ?><?php print theme('links', $main_menu, array('class' => 'links', 'id' => 'navlist')) ?><?php } ?>
+      <?php print theme('links__system_secondary_menu', array(
+          'links' => $secondary_menu,
+          'attributes' => array(
+            'id' => 'subnavlist',
+            'class' => array('links'),
+          ),
+        )); ?>
+      <?php print theme('links__system_main_menu', array(
+          'links' => $main_menu,
+          'attributes' => array(
+            'id' => 'navlist',
+            'class' => array('links'),
+          ),
+        )); ?>
     </div>
 
-    <div id="header-region"><?php print $header ?></div>
+    <div id="header-region"><?php print render($page['header']) ?></div>
   </div>
 
   <div class="layout-columns">
-    <?php if ($left) { ?><div id="sidebar-left" class="column"><?php print $left ?></div><?php } ?>
+    <?php if ($page['sidebar_first']) { ?><div id="sidebar-left" class="column"><?php print render($page['sidebar_first']) ?></div><?php } ?>
 
     <div id="main" class="column">
-      <?php if ($mission) { ?><div id="mission"><?php print $mission ?></div><?php } ?>
+      <?php if ($page['highlighted']) { ?><div id="mission"><?php print render($page['highlighted']) ?></div><?php } ?>
       <div class="inner">
         <?php print $breadcrumb ?>
-        <h1 class="title"><?php print $title ?></h1>
-        <?php if ($tabs) { ?><div class="tabs"><?php print $tabs ?></div><?php } ?>
-        <?php print $help ?>
+        <?php print render($title_prefix) ?><h1 class="title"><?php print $title ?></h1><?php print render($title_suffix) ?>
+        <?php if ($tabs) { ?><div class="tabs"><?php print render($tabs) ?></div><?php } ?>
+        <?php print render($page['help']) ?>
         <?php if ($show_messages) { print $messages; } ?>
-        <?php print $content; ?>
+		<?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
+        <?php print render($page['content']); ?>
         <?php print $feed_icons; ?>
       </div>
     </div>
 
-    <?php if ($right) { ?><div id="sidebar-right" class="column"><?php print $right ?></div><?php } ?>
+    <?php if ($page['sidebar_second']) { ?><div id="sidebar-right" class="column"><?php print render($page['sidebar_second']) ?></div><?php } ?>
   </div>
 
   <div id="footer">
-    <?php print $footer_message ?>
-    <?php print $footer ?>
+    <?php print render($page['footer']) ?>
   </div>
-
-<?php print $closure ?>
-</body>
-</html>
diff -upr bluemarine.orig/style.css bluemarine/style.css
--- bluemarine.orig/style.css	2009-03-11 11:35:44.000000000 -0400
+++ bluemarine/style.css	2010-11-22 22:18:39.000000000 -0500
@@ -33,13 +33,13 @@ a {
   text-decoration: none;
   font-weight: bold;
 }
-a:link {
+a:link, #forum a:link{
   color: #39c;
 }
-a:visited {
+a:visited, #forum a:visited{
   color: #369;
 }
-a:hover {
+a:hover, #forum a:hover{
   color: #39c;
   text-decoration: underline;
 }
@@ -126,6 +126,7 @@ body {
   margin: 0.6em 0 0 ;
   font-size: 2em;
   white-space: nowrap;
+  float: left;
 }
 .site-name a:link, .site-name a:visited {
   color: #fff;
@@ -142,7 +143,7 @@ body {
   font-style: italic;
   font-weight: bold;
 }
-.search-box {
+.block-search {
   float: right; /* LTR */
   margin: 1em;
 }
@@ -151,21 +152,33 @@ body {
   text-align: right; /* LTR */
   vertical-align: middle;
 }
+
+ul.menu{
+  padding: 0;
+  margin-left: 0;
+}
+
+ul.menu li{
+  padding: 0;
+  margin-left: 15px;
+}
+
 #header-region {
   clear: both;
 }
 
 #navlist {
   font-size: 1.0em;
-  padding: 0 0.8em 0.5em 0; /* LTR */
+  padding: 0 0.8em 0 0; /* LTR */
   color: #9cf;
 }
 #navlist a {
   font-weight: bold;
   color: #fff;
 }
+
 #subnavlist {
-  padding: 0.5em 1.2em 0.4em 0; /* LTR */
+  padding: 0 1.2em 0 0; /* LTR */
   font-size: 0.8em;
   color: #9cf;
 }
@@ -173,21 +186,51 @@ body {
   font-weight: bold;
   color: #9cf;
 }
+
+#navlist ul, #subnavlist ul {
+  text-align: right;
+  float: right;
+}
+#navlist li, #subnavlist li {
+  text-align: right;
+  display: inline;
+  list-style: none;
+  padding-left: 4px;
+  padding-right: 4px;
+}
+#navlist.links, #subnavlist.links {
+  margin-top: .3em;
+}
+
 ul.links li {
   border-left: 1px solid #9cf; /* LTR */
 }
 ul.links li.first {
   border: none;
 }
-#search .form-text, #search .form-submit {
+#block-search-form, #search-block-form, #block-search{
+  padding: 0 0.2em 0 0;
+  margin: 0;
+  border: none;
+}
+#search-block-form input{
   border: 1px solid #369;
   font-size: 1.1em;
   height: 1.5em;
   vertical-align: middle;
 }
-#search .form-text {
+#search-block-form input.form-text{
   width: 8em;
   padding: 0 0.5em;
+}
+#block-search-form h2.title{
+  float: left;
+  color: #000;
+  font-size: 1.0em;
+  padding-top: 0.2em;
+}
+#block-search-form div.content{
+  float: right;
 }
 #mission {
   background-color: #369;
@@ -258,9 +301,6 @@ ul.links li.first {
 .block .title {
   margin-bottom: .25em;
 }
-.box .title {
-  font-size: 1.1em;
-}
 .node {
   margin: .5em 0 2em; /* LTR */
 }
@@ -329,27 +369,17 @@ ul.links li.first {
   width: 100%;
 }
 #forum td {
-  padding: 0.5em;
+  height: 24px;
+}
+#forum .title, #forum a{
+  font-size: 1em;
 }
 #forum td.forum, #forum td.posts {
   background-color: #eee;
 }
-#forum td.topics, #forum td.last-reply {
+#forum td.topics, #forum td.title, #forum td.last-reply {
   background-color: #ddd;
 }
-#forum td.container {
-  background-color: #ccc;
-}
-#forum td.container a {
-  color: #555;
-}
-#forum td.statistics, #forum td.settings, #forum td.pager {
-  height: 1.5em;
-  border: 1px solid #bbb;
-}
-#forum td .name {
-  color: #96c;
-}
 #forum td .links {
   padding-top: 0.7em;
   font-size: 0.9em;
@@ -378,3 +408,27 @@ div.admin-panel h3 {
   padding: 5px 8px 5px;
   margin: 0;
 }
+
+.version-links .links li {
+  text-align: right;
+  display: inline;
+  list-style: none;
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
+table.system-status-report tr.ok{
+  background-color: #dfd;
+}
+
+div.vertical-tabs ul.vertical-tabs-list a {
+  font-weight: normal;
+}
+
+div.vertical-tabs ul.vertical-tabs-list li strong {
+  font-weight: bold;
+}
+
+div.vertical-tabs ul.vertical-tabs-list li.selected small {
+  color: #000;
+}
+
+div.vertical-tabs ul.vertical-tabs-list li.selected a strong {
+  color: #000;
+}