diff --git a/block.tpl.php b/block.tpl.php
index 1b7b4d2..e87e0da 100644
--- a/block.tpl.php
+++ b/block.tpl.php
@@ -9,6 +9,6 @@
     <h4><?php print $block->subject; ?></h4>
   <?php endif; ?>
 
-  <div class="content"><?php print $block->content; ?></div>
+  <div class="content"><?php print $content; ?></div>
 </div>
 
diff --git a/box.tpl.php b/box.tpl.php
deleted file mode 100644
index 1008e7d..0000000
--- a/box.tpl.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Change title from <h2> to <h3>
- */
-?>
-
-<div class="box">
-  <?php if (!empty($title)): ?>
-    <h3><?php print $title; ?></h3>
-  <?php endif; ?>
-
-  <div class="content"><?php print $content; ?></div>
-</div>
-
diff --git a/comment.tpl.php b/comment.tpl.php
index 5695ed4..7ee0456 100644
--- a/comment.tpl.php
+++ b/comment.tpl.php
@@ -4,7 +4,7 @@
  */
 ?>
 
-<div class="comment<?php if (!empty($comment->new)) print ' comment-new'; ?> <?php print $status; ?> clear-block">
+<div class="comment<?php if (!empty($comment->new)) print ' comment-new'; ?> <?php print $status; ?> clearfix">
 
   <?php if (!empty($comment->new)): ?>
     <span class="new"><?php print $new; ?></span>
@@ -19,7 +19,7 @@
   <div class="content">
     <?php print $content; ?>
     <?php if (!empty($signature)): ?>
-      <div class="user-signature clear-block"><?php print $signature; ?></div>
+      <div class="user-signature clearfix"><?php print $signature; ?></div>
     <?php endif; ?>
   </div>
 
diff --git a/node.tpl.php b/node.tpl.php
index 5df508c..576eb3c 100644
--- a/node.tpl.php
+++ b/node.tpl.php
@@ -4,7 +4,7 @@
  */
 ?>
 
-<div id="node-<?php print $node->nid; ?>" class="node<?php if (!empty($sticky)) print ' sticky'; ?><?php if (empty($status)) print ' node-unpublished'; ?> clear-block">
+<div id="node-<?php print $node->nid; ?>" class="node<?php if (!empty($sticky)) print ' sticky'; ?><?php if (empty($status)) print ' node-unpublished'; ?> clearfix">
 
   <?php if (empty($page)): ?>
     <h3 class="title"><a href="<?php print $node_url; ?>" title="<?php print $title; ?>"><?php print $title; ?></a></h3>
@@ -17,7 +17,7 @@
   <div class="content"><?php print $content; ?></div>
 
   <?php if (!empty($links) || !empty($terms)): ?>
-    <div class="meta<?php if (!empty($links)) print ' has_links'; ?><?php if (!empty($terms)) print ' has_terms'; ?> clear-block">
+    <div class="meta<?php if (!empty($links)) print ' has_links'; ?><?php if (!empty($terms)) print ' has_terms'; ?> clearfix">
 
       <?php if (!empty($links)): ?>
         <div class="node-links"><?php print $links; ?></div>
diff --git a/page.tpl.php b/page.tpl.php
index cf0cbcc..6c770c3 100644
--- a/page.tpl.php
+++ b/page.tpl.php
@@ -1,6 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!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 ?>" lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
-<head>
+<?php print $rdf_namespaces ?>>
+ <head profile="<?php print $grddl_profile ?>">
 
   <title><?php print $head_title; ?></title>
   <?php print $head; ?>
@@ -23,15 +24,15 @@
         <?php endif; ?>
       </div> <!-- /title -->
 
-      <?php if (!empty($primary_links)): ?>
-        <div id="primary"><?php print theme('links', $primary_links, array('class' => 'links primary-links')); ?></div>
+      <?php if (!empty($main_menu)): ?>
+        <div id="primary"><?php print theme('links', $main_menu, array('class' => 'links primary-links')); ?></div>
       <?php endif; ?>
 
-      <?php print $search_box; ?>
+     <?php print render($page['highlighted']); ?>
 
     </div></div></div> <!-- /header-inner /header /header-outer -->
-    <div id="container"><div id="container-inner" class="clear-block">
-      <div id="main"><div id="main-inner" class="clear-block">
+    <div id="container"><div id="container-inner" class="clearfix">
+      <div id="main"><div id="main-inner" class="clearfix">
 
         <?php if (!empty($breadcrumb) || !empty($mission) || !empty($content_top) || !empty($messages)): ?>
           <div id="content-top-region">
@@ -76,10 +77,10 @@
 
         </div></div> <!-- /content-inner /content -->
 
-        <?php if (!empty($right)): ?>
-          <div id="sidebar-right"><div id="sidebar-right-inner">
-            <?php print $right; ?>
-          </div></div> <!-- /sidebar-right-inner /sidebar-right -->
+        <?php if (!empty($sidebar_second)): ?>
+          <div id="sidebar-second"><div id="sidebar-second-inner">
+            <?php print $sidebar_second; ?>
+          </div></div> <!-- /sidebar-second-inner /sidebar-second -->
         <?php endif; ?>
 
         <?php if (!empty($content_bottom)): ?>
@@ -88,19 +89,19 @@
 
       </div></div> <!-- /main-inner /main -->
 
-      <?php if (!empty($secondary_links) || !empty($left)): ?>
-        <div id="sidebar-left"><div id="sidebar-left-inner">
-          <?php if (!empty($secondary_links)): ?>
-            <div id="secondary"><?php print theme('links', $secondary_links, array('class' => 'links secondary-links')); ?></div>
+      <?php if (!empty($secondary_menu) || !empty($sidebar_first)): ?>
+        <div id="sidebar-first"><div id="sidebar-first-inner">
+          <?php if (!empty($secondary_menu)): ?>
+            <div id="secondary"><?php print theme('links', $secondary_menu, array('class' => 'links secondary-links')); ?></div>
           <?php endif; ?>
-          <?php print $left; ?>
-        </div></div> <!-- /sidebar-left-inner /sidebar-left -->
+          <?php print $sidebar_first; ?>
+        </div></div> <!-- /sidebar-first-inner /sidebar-first -->
       <?php endif; ?>
 
     </div></div> <!-- /container-inner /container -->
 
     <?php if (!empty($footer) || !empty($footer_message)): ?>
-      <div id="footer"><div id="footer-inner" class="clear-block">
+      <div id="footer"><div id="footer-inner" class="clearfix">
         <?php if (!empty($footer)): ?>
           <div id="footer-region" class="clear-block"><?php print $footer; ?></div>
         <?php endif; ?>
@@ -116,7 +117,9 @@
 
   </div> <!-- /page -->
 
-  <?php print $closure; ?>
+  <?php print $page_top; ?>
+  <?php print $page; ?>
+  <?php print $page_bottom; ?>
 
 </body>
 </html>
diff --git a/scaccarium.css b/scaccarium.css
index 2f9edcd..5e6fcf6 100644
--- a/scaccarium.css
+++ b/scaccarium.css
@@ -160,22 +160,22 @@ body.fixed #container-inner {
   clear: both;
 }
 
-#sidebar-right {
+#sidebar-second {
   float: right;
   width: 220px;
 }
 
-#sidebar-right-inner {
+#sidebar-second-inner {
   border-left: 1px dotted #b79c56;
   padding: 0 0 5px 20px;
 }
 
-#sidebar-left {
+#sidebar-first {
   float: left;
   width: 220px;
 }
 
-#sidebar-left-inner {
+#sidebar-first-inner {
   border-right: 1px dotted #b79c56;
   margin-top: 100px;
   padding: 50px 20px 5px 0;
@@ -261,48 +261,48 @@ body.fixed #knight-bishop-inner {
 }
 
 /*** Left Sidebar ***/
-body.sidebar-left #main,
+body.sidebar-first #main,
 body.two-sidebars #main {
   float: right;
   margin-left: -220px;
 }
 
-body.sidebar-left #main-inner,
+body.sidebar-first #main-inner,
 body.two-sidebars #main-inner {
   margin-left: 220px;
 }
 
-body.sidebar-left #content-inner,
+body.sidebar-first #content-inner,
 body.two-sidebars #content-inner {
   padding-left: 20px;
 }
 
-body.sidebar-left #content-bottom,
+body.sidebar-first #content-bottom,
 body.two-sidebars #content-bottom {
   padding-left: 20px;
 }
 
 /*** Right Sidebar ***/
-body.sidebar-right #content,
+body.sidebar-second #content,
 body.two-sidebars #content {
   float: left;
   margin-right: -220px;
 }
 
-body.sidebar-right #content-inner,
+body.sidebar-second #content-inner,
 body.two-sidebars #content-inner {
   margin-right: 220px;
   padding-right: 20px;
 }
 
 /*** No Left Sidebar ***/
-body.sidebar-right #content-top-region,
+body.sidebar-second #content-top-region,
 body.no-sidebars #content-top-region {
   margin-left: 220px;
   min-height: 130px;
 }
 
-body.sidebar-right.content-top-region-empty #content,
+body.sidebar-second.content-top-region-empty #content,
 body.no-sidebars.content-top-region-empty #content {
   margin-top: 130px;
 }
diff --git a/scaccarium.info b/scaccarium.info
index ca988c6..1806a6a 100644
--- a/scaccarium.info
+++ b/scaccarium.info
@@ -1,24 +1,28 @@
 name = Scaccarium
 description = A tableless, CSS-based, multi-column, variable-width layout with a chess theme.
-core = 6.x
+core = 7.x
 engine = phptemplate
 
 regions[content_top] = Content top
 regions[node_top] = Node top
+regions[highlighted] = Highlighted
+regions[content] = Content
 regions[left] = Left sidebar
 regions[right] = Right sidebar
 regions[node_bottom] = Node bottom
 regions[content_bottom] = Content bottom
 regions[footer] = Footer
+regions[help] = Help
+regions[page_top] = Page top
+regions[page_bottom] = Page bottom
 
 features[] = name
 features[] = slogan
-features[] = mission
 features[] = search
 features[] = favicon
-features[] = primary_links
-features[] = secondary_links
+features[] = main_menu
+features[] = secondary_menu
 
 stylesheets[all][] = scaccarium.css
 stylesheets[all][] = custom.css
-
+settings[scaccarium_layout] = fluid
diff --git a/template.php b/template.php
index a6c4d41..508e6da 100644
--- a/template.php
+++ b/template.php
@@ -1,31 +1,5 @@
 <?php
 /**
- * Initialize theme settings
- */
-if (is_null(theme_get_setting('scaccarium_layout'))) {
-  global $theme_key;
-
-  $defaults = array(
-    'scaccarium_layout' => 'fluid',
-  );
-
-  $settings = theme_get_settings($theme_key);
-
-  if (module_exists('node')) {
-    foreach (node_get_types() as $type => $name) {
-      unset($settings['toggle_node_info_' . $type]);
-    }
-  }
-
-  variable_set(
-    str_replace('/', '_', 'theme_'. $theme_key .'_settings'),
-    array_merge($defaults, $settings)
-  );
-
-  theme_get_setting('', TRUE);
-}
-
-/**
  * Theme links
  *
  * Add extra <span> to Primary links
@@ -124,11 +98,11 @@ function scaccarium_preprocess_page(&$variables) {
 
   // Reset 'layout'
   $variables['layout'] = 'none';
-  if (!empty($variables['secondary_links']) || !empty($variables['left'])) {
-    $variables['layout'] = 'left';
+  if (!empty($variables['secondary_menu']) || !empty($variables['sidebar_first'])) {
+    $variables['layout'] = 'sidebar_first';
   }
-  if (!empty($variables['right'])) {
-    $variables['layout'] = ($variables['layout'] == 'left') ? 'both' : 'right';
+  if (!empty($variables['sidebar_second'])) {
+    $variables['layout'] = ($variables['layout'] == 'sidebar_first') ? 'both' : 'sidebar_second';
   }
 
   // Add sidebars to body classes
diff --git a/theme-settings.php b/theme-settings.php
index 4cb108c..cc9d67b 100644
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -3,24 +3,16 @@
  * Theme settings for Scaccarium
  */
 
-function scaccarium_settings($saved_settings) {
-  $defaults = array(
-    'scaccarium_layout' => 'fluid',
-  );
-
-  $settings = array_merge($defaults, $saved_settings);
-
-  $form['scaccarium_layout'] = array(
+<?php
+function themename_form_system_theme_settings_alter(&$form, &$form_state) {
+  $form['theme_settings']['scaccarium_layout'] = array(
     '#type' => 'radios',
     '#title' => t('Layout'),
     '#description' => t('Fluid - Page will use a full-width layout that scales to any screen size.') .'<br />'. t('Fixed-Width - Page will be set at 960px wide for all screen sizes.'),
-    '#default_value' => $settings['scaccarium_layout'],
+    '#default_value' => theme_get_setting('fluid'),
     '#options' => array(
       'fluid' => t('Fluid'),
       'fixed' => t('Fixed-Width'),
     ),
   );
-
-  return $form;
 }
-
