--- page.tpl.php.orig	Sat Nov 20 22:04:25 2010
+++ page.tpl.php	Sat Nov 20 22:03:53 2010
@@ -1,17 +1,6 @@
 <?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 } ?>
@@ -23,33 +12,28 @@
       <?php if (isset($main_menu)) { ?><?php print theme('links', $main_menu, array('class' => 'links', 'id' => 'navlist')) ?><?php } ?>
     </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 print render($title_prefix) ?><h1 class="title"><?php print $title ?></h1><?php print render($title_suffix) ?>
         <?php if ($tabs) { ?><div class="tabs"><?php print $tabs ?></div><?php } ?>
-        <?php print $help ?>
+        <?php print render($page['help']) ?>
         <?php if ($show_messages) { print $messages; } ?>
-        <?php print $content; ?>
+        <?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>
