diff --git a/block.tpl.php b/block.tpl.php
index 4a42c5b..f2a2daf 100644
--- a/block.tpl.php
+++ b/block.tpl.php
@@ -1,10 +1,53 @@
+<?php
 
+/**
+ * @file
+ * Default theme implementation to display a block.
+ *
+ * Available variables:
+ * - $block->subject: Block title.
+ * - $content: Block content.
+ * - $block->module: Module that generated the block.
+ * - $block->delta: An ID for the block, unique within each module.
+ * - $block->region: The block region embedding the current block.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the following:
+ *   - block: The current template type, i.e., "theming hook".
+ *   - block-[module]: The module generating the block. For example, the user module
+ *     is responsible for handling the default user navigation block. In that case
+ *     the class would be "block-user".
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ *
+ * Helper variables:
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ * - $block_zebra: Outputs 'odd' and 'even' dependent on each block region.
+ * - $zebra: Same output as $block_zebra but independent of any block region.
+ * - $block_id: Counter dependent on each block region.
+ * - $id: Same output as $block_id but independent of any block region.
+ * - $is_front: Flags true when presented in the front page.
+ * - $logged_in: Flags true when the current user is a logged-in member.
+ * - $is_admin: Flags true when the current user is an administrator.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_block()
+ * @see template_process()
+ */
+?>
 
-<?php if (!empty($block->subject)): ?>
-  <h2><?php print $block->subject ?></h2>
-<?php endif;?>
-
+<div id="<?php print $block->module . '-' . $block->delta; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
+  <?php print render($title_prefix); ?>
+  <?php if (!empty($block->subject)): ?>
+    <h2<?php print $title_attributes; ?>><?php print $block->subject ?></h2>
+  <?php endif; ?>
+  <?php print render($title_suffix); ?>
   <div class="block_inside">
-    <div class="content"><?php print $block->content ?></div>
+    <?php print render($content); ?>
   </div>
-  
+</div>
diff --git a/freestyle.info b/freestyle.info
index a503bdf..96f6e36 100644
--- a/freestyle.info
+++ b/freestyle.info
@@ -1,11 +1,14 @@
 name = Freestyle
-description = 80's neon punk blog design by Tony Pires, converted to Drupal 6 by Sean Effel.
-version = VERSION
-core = 6.x
+description = 80's neon punk blog design by Tony Pires.
+core   = 7.x
 engine = phptemplate
+
 stylesheets[all][] = style.css
 stylesheets[print][] = print.css
 
-regions[right] = Right sidebar
+regions[highlight] = Highlight
+regions[help] = Help
+regions[content] = Main Content
+regions[secondary_sidebar] = Right sidebar
 regions[header] = Header
-regions[footer] = Footer
\ No newline at end of file
+regions[footer] = Footer
diff --git a/node.tpl.php b/node.tpl.php
index 92127c0..1581300 100644
--- a/node.tpl.php
+++ b/node.tpl.php
@@ -1,31 +1,110 @@
 <?php
-?>
-<div id="node-<?php print $node->nid; ?>" class="node<?php if ($sticky) { print ' sticky'; } ?><?php if (!$status) { print ' node-unpublished'; } ?>">
 
-<?php print $picture ?>
+/**
+ * @file
+ * Default theme implementation to display a node.
+ *
+ * Available variables:
+ * - $title: the (sanitized) title of the node.
+ * - $content: An array of node items. Use render($content) to print them all, or
+ *   print a subset such as render($content['field_example']). Use
+ *   hide($content['field_example']) to temporarily suppress the printing of a
+ *   given element.
+ * - $user_picture: The node author's picture from user-picture.tpl.php.
+ * - $date: Formatted creation date. Preprocess functions can reformat it by
+ *   calling format_date() with the desired parameters on the $created variable.
+ * - $name: Themed username of node author output from theme_username().
+ * - $node_url: Direct url of the current node.
+ * - $terms: the themed list of taxonomy term links output from theme_links().
+ * - $display_submitted: whether submission information should be displayed.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the following:
+ *   - node: The current template type, i.e., "theming hook".
+ *   - node-[type]: The current node type. For example, if the node is a
+ *     "Blog entry" it would result in "node-blog". Note that the machine
+ *     name will often be in a short form of the human readable label.
+ *   - node-teaser: Nodes in teaser form.
+ *   - node-preview: Nodes in preview mode.
+ *   The following are controlled through the node publishing options.
+ *   - node-promoted: Nodes promoted to the front page.
+ *   - node-sticky: Nodes ordered above other non-sticky nodes in teaser listings.
+ *   - node-unpublished: Unpublished nodes visible only to administrators.
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ *
+ * Other variables:
+ * - $node: Full node object. Contains data that may not be safe.
+ * - $type: Node type, i.e. story, page, blog, etc.
+ * - $comment_count: Number of comments attached to the node.
+ * - $uid: User ID of the node author.
+ * - $created: Time the node was published formatted in Unix timestamp.
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ * - $zebra: Outputs either "even" or "odd". Useful for zebra striping in
+ *   teaser listings.
+ * - $id: Position of the node. Increments each time it's output.
+ *
+ * Node status variables:
+ * - $view_mode: View mode, e.g. 'full', 'teaser'...
+ * - $teaser: Flag for the teaser state (shortcut for $view_mode == 'teaser').
+ * - $page: Flag for the full page state.
+ * - $promote: Flag for front page promotion state.
+ * - $sticky: Flags for sticky post setting.
+ * - $status: Flag for published status.
+ * - $comment: State of comment settings for the node.
+ * - $readmore: Flags true if the teaser content of the node cannot hold the
+ *   main body content.
+ * - $is_front: Flags true when presented in the front page.
+ * - $logged_in: Flags true when the current user is a logged-in member.
+ * - $is_admin: Flags true when the current user is an administrator.
+ *
+ * Field variables: for each field instance attached to the node a corresponding
+ * variable is defined, e.g. $node->body becomes $body. When needing to access
+ * a field's raw values, developers/themers are strongly encouraged to use these
+ * variables. Otherwise they will have to explicitly specify the desired field
+ * language, e.g. $node->body['en'], thus overriding any language negotiation
+ * rule that was previously applied.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_node()
+ * @see template_process()
+ */
+?>
+  <?php if ($user_picture): ?>
+    <div class="user-picture">
+      <?php print $user_picture; ?>
+    </div>
+  <?php endif; ?>
 
-<?php if ($page == 0): ?>
-  <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
-<?php endif; ?>
+  <?php if ($page == 0): ?>
+    <?php print render($title_prefix); ?>
+    <h2<?php print $title_attributes; ?>><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
+    <?php print render($title_suffix); ?>
+  <?php endif; ?>
 
-  <?php if ($submitted): ?>
+  <?php if ($display_submitted): ?>
     <div class="submitted"><?php print $submitted; ?></div>
   <?php endif; ?>
-
-  <div class="content">
-    <?php print $content ?>
-  </div>
+    <?php
+      hide($content['links']);
+      hide($content['comments']);
+      hide($content['field_tags']);
+      print render($content);
+    ?>
 
   <div class="blogfoot">
-    
-    <?php if ($taxonomy): ?>
-      <span class="foot_top">Filed under: <?php print $terms ?></span><br/>
+
+    <?php if ($content['field_tags']): ?>
+      <span class="foot_top"><?php t('Filed under'); ?>: <?php print render($content['field_tags']) ?></span><br/>
     <?php endif;?>
 
-    <?php if ($links): ?>
-      <span class="foot_bottom"><?php print $links; ?></span>
+    <?php if ($content['links']): ?>
+      <span class="foot_bottom"><?php print render($content['links']); ?></span>
     <?php endif; ?>
-    
-  </div>
 
-</div>
+  </div>
diff --git a/page.tpl.php b/page.tpl.php
index 6439a95..919f626 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -1,86 +1,67 @@
-<!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" xml:lang="<?php print $language->language ?>" lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
-
-<head>
-<title><?php print $head_title ?></title>
-    <?php print $head ?>
-    <?php print $styles ?>
-    <?php print $scripts ?>
-</head>
-
-<body>
-
 <div id="container">
 	<div id="rightside">
-		
 		<div id="title"><p><?php print $site_name; ?></p></div>
-		
 		<div id="sidebar">
-		  
-		  <ul class="nav">
-			<?php if (isset($primary_links)) : ?>
-            <?php print theme('links', $primary_links, array('class' => 'links primary-links')) ?>
-            <?php endif; ?>
-		  </ul>
-		
-          <?php if ($left): ?>
-            <div id="sidebar-left" class="sidebar">
-            <?php if ($search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
-            <?php print $left ?>
-            </div>
-          <?php endif; ?>
-          
-          <?php if ($right): ?>
-            <div id="sidebar-right" class="sidebar">
-            <?php if (!$left && $search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
-            <?php print $right ?>
-            </div>
-          <?php endif; ?>
-        
-        </div><!-- /sidebar -->
-	
+				<ul class="nav">
+					<?php if (!empty($main_menu)): ?>
+							<?php print theme('links__system_main_menu', array(
+									'links' => $main_menu,
+									'attributes' => array(
+											'class' => array('links', 'primary-links'),
+									),
+									'heading' => array(
+													'text' => t('Main menu'),
+													'level' => 'h2',
+													'class' => array('element-invisible'),
+											),
+									)); ?>
+					<?php endif; ?>
+				</ul>
+
+				<?php if (!empty($page['sidebar_second'])): ?>
+					<div id="sidebar-right" class="sidebar">
+						<?php print render($page['sidebar_second']); ?>
+					</div>
+			<?php endif; ?>
+		</div><!-- /sidebar -->
 	</div><!-- /rightside -->
-	
-	
+
+
 	<div id="main">
-	
-		<?php if ($header): ?>
-            <div id="header"><?php print $header ?></div>
-    	<?php endif; ?> 
-        
+		<?php if ($page['header']): ?>
+    <div id="header"><?php print render($page['header']); ?></div>
+  <?php endif; ?>
+
 		<div id="content">
-    
-    	  <?php print $breadcrumb; ?>
-          <?php if ($mission): print '<div id="mission">'. $mission .'</div>'; endif; ?>
-          <?php if ($title): print '<h2'. ($tabs ? ' class="with-tabs"' : '') .'>'. $title .'</h2>'; endif; ?>
-          <?php if ($tabs): print '<div id="tabs-wrapper" class="clear-block">'; endif; ?>
-          <?php if ($tabs): print '<ul class="tabs primary">'. $tabs .'</ul></div>'; endif; ?>
-          <?php if ($tabs2): print '<ul class="tabs secondary">'. $tabs2 .'</ul>'; endif; ?>
-          <?php if ($show_messages && $messages): print $messages; endif; ?>
-          <?php print $help; ?>
-		  <?php print $content ?>
-          <?php print $feed_icons ?>
-    
-    	</div>
-		
+			<a id="main-content"></a>
+   <?php if ($breadcrumb): print $breadcrumb; endif; ?>
+			<?php if (!empty($page['highlighted'])): ?>
+				<div id="mission"><?php print render($page['highlighted']); ?></div>
+			<?php endif; ?>
+   <?php print render($title_prefix); ?>
+			<?php if ($title): print '<h2'. ($tabs ? ' class="with-tabs"' : '') . '>' . $title . '</h2>'; endif; ?>
+			<?php print render($title_suffix); ?>
+   <?php if ($tabs): print '<ul class="tabs primary">' . render($tabs) . '</ul></div>'; endif; ?>
+   <?php if (!empty($tabs2)): print '<ul class="tabs secondary">' . render($tabs2) . '</ul>'; endif; ?>
+			<?php if ($action_links): ?>
+    <ul class="action-links">
+     <?php print render($action_links); ?>
+    </ul>
+   <?php endif; ?>
+			<?php if ($messages): print $messages; endif; ?>
+   <?php print render($page['help']); ?>
+		 <?php print render($page['content']); ?>
+   <?php print $feed_icons ?>
+		</div>
+
 		<div id="footer">
-		<?php if ($footer): ?>
-            <?php print $footer ?>
-            <div id="credits">&copy; <?php print $site_name; ?>
-            <?php if ($footer_message): print ' : '. $footer_message ; endif; ?>
-            </div>
-        <?php endif; ?>
-	
+			<?php if (!empty($page['footer'])): ?>
+			 <?php print render($page['footer']); ?>
+			 <div id="credits">&copy; <?php print date('Y') . ' ' . $site_name; ?></div>
+   <?php endif; ?>
+		</div>
+		<div id="end"></div><!-- /end -->
 	</div> <!-- /main -->
-	
-	<div id="end">
-	</div><!-- /end -->
-	
-	</div>
-</div>
 
-<?php print $closure ?>
 
-</body>
-</html>
\ No newline at end of file
+</div>
diff --git a/style.css b/style.css
index 8212d91..5bf4d2f 100644
--- a/style.css
+++ b/style.css
@@ -61,7 +61,7 @@ body{
 
 #sidebar .block_inside {
 	padding: 10px;
-	
+
  }
 
 #rightside{
@@ -100,35 +100,35 @@ body{
 
 #content .clear-block .block_inside,
 #footer .clear-block .block_inside {
-	list-style-type: none; 
-	overflow: hidden; 
+	list-style-type: none;
+	overflow: hidden;
 	border: none;
 	border-top: none;
 	border-style: none;
 	background-color: #000;
 }
 
-.block_inside { 
-	list-style-type: none; 
-	overflow: hidden; 
-	width: 208px; 
+#rightside .block_inside {
+	list-style-type: none;
+	overflow: hidden;
+	width: 208px;
 	border: 4px solid #FFF000;
 	border-top: 8px solid #FFF000;
 	border-style: solid solid;
 	background-color: #ED145A;
-	
+
 }
 
-#header .block_inside, 
+#header .block_inside,
 #footer .block_inside {
-	list-style-type: none; 
-	overflow: hidden; 
-	width: 380px; 
+	list-style-type: none;
+	overflow: hidden;
+	width: 380px;
 	border: none;
 	background-color: #000;
-	
+
  }
- 
+
 #end {
 	background: url(img/footer.gif) no-repeat bottom right transparent;
 	height: 300px;
@@ -146,7 +146,7 @@ body{
 	text-align:left;
 }
 
- 
+
 .breadcrumb {
     padding-top: 20px;
     width: 350px;
@@ -289,6 +289,7 @@ textarea {
 
 #content p{
 	font:12px Arial, Helvetica, sans-serif;
+ color:#fff;
 	line-height:20px;
 	letter-spacing:1px;
 }
@@ -342,7 +343,7 @@ textarea {
 
 #sidebar p{
 	line-height:16px;
-	margin: -5px 0 0 0; 
+	margin: -5px 0 0 0;
 }
 
 
@@ -564,13 +565,13 @@ ul.primary li a:hover {
 }
 
 
-.admin a, .help a, 
+.admin a, .help a,
 html.js fieldset.collapsible legend a {
 	color:#FFF000;
 	text-decoration: none;
 }
 
-.admin a:hover, .help a:hover, 
+.admin a:hover, .help a:hover,
 html.js fieldset.collapsible legend a {
 	color:#ED145A;
 	text-decoration: none;
@@ -719,7 +720,7 @@ tr.drag-previous {
 	border:2px solid #FFF000;
 	padding:3px;
 	float: left;
-	margin-right: 5px; 
+	margin-right: 5px;
 	margin-top: 4px;
 }
 
@@ -796,15 +797,15 @@ ul.primary {
 
 
 #content .foot_top li:after  {
-	content: ", "; 
+	content: ", ";
 }
 
 #content .foot_top li.last:after  {
-	content: ""; 
+	content: "";
 }
 
 #content .foot_top li.first  {
-	padding-left: 5px; 
+	padding-left: 5px;
 }
 
 #content .foot_top li a {
@@ -828,11 +829,11 @@ ul.primary {
 }
 
 #content .foot_bottom li:after  {
-	content: " | "; 
+	content: " | ";
 }
 
 #content .foot_bottom li.last:after  {
-	content: ""; 
+	content: "";
 }
 
 #content .foot_bottom li a {
@@ -843,7 +844,6 @@ ul.primary {
 	color: #ED145A;
 }
 
-
 #content .blogfoot{
 	border-left:4px solid #FFF000;
 	padding-left:4px;
@@ -867,7 +867,7 @@ ul.primary {
 
 #header li.top_link,
 #footer li.top_link{
-	display:block; 
+	display:block;
 	color:#DDD;
 	padding:10px 0;
 	margin:1px 0;
@@ -898,8 +898,8 @@ ul.primary {
 	background-color:#252525;
 	color:#ED145A;
 }
- 
- 
+
+
 
 
 
@@ -908,9 +908,9 @@ ul.primary {
 
 
 #gallery li a{
-	display:block; 
+	display:block;
 	height:30px;
-	width:218px; 
+	width:218px;
 	text-decoration:none;
 	color:#FFF;
 	overflow:hidden;
@@ -918,7 +918,7 @@ ul.primary {
 }
 
 #gallery li a:hover{
-	background-color:#FFF000; 
+	background-color:#FFF000;
 	height:180px;
 	color:#333;
 }