diff --git a/sass/partials/common/_forms.scss b/sass/partials/common/_forms.scss
index f2ecb07..025f71a 100644
--- a/sass/partials/common/_forms.scss
+++ b/sass/partials/common/_forms.scss
@@ -112,7 +112,7 @@ a.link-button:hover {
 .link-button span {
   cursor: pointer;
   display: inline-block;
-  line-height: 36px;
+  line-height: 3em;
 }
 
 input.default {
diff --git a/sass/partials/common/_global.scss b/sass/partials/common/_global.scss
index d2303a9..41fdfb8 100644
--- a/sass/partials/common/_global.scss
+++ b/sass/partials/common/_global.scss
@@ -4,11 +4,11 @@
 // For the moment we are NOT using the container() mixin from Susy. We're specifying a pixel-width.
 // The reason is because our initial port is not aiming to be responsive.
 ////////////////////////
-
 .container-12 {
   margin-left: auto;
   margin-right: auto;
-  width: 960px;
+  max-width: 1290px;
+  /* width: 960px; */
   padding: 0 10px;
   //@include susy-grid-background;
 }
@@ -16,7 +16,10 @@
 #header,
 #footer,
 #page {
-  min-width: 960px;
+  /* min-width: 960px; */
+  max-width: 1290px;
+  margin-left: auto;
+  margin-right: auto;
 }
 
 //Support for Legacy Grid-x classes - for db content like the support page
diff --git a/sass/partials/common/_header.scss b/sass/partials/common/_header.scss
index 5813378..8a93c2d 100644
--- a/sass/partials/common/_header.scss
+++ b/sass/partials/common/_header.scss
@@ -34,7 +34,7 @@ div#site-name {
   height: 63px;
   overflow: hidden;
   text-indent: -999em;
-  width: 181px;
+  width: 0.1885417em; /* 181 / 960 */
 }
 #site-name a:focus,
 #site-name a:active {
@@ -52,5 +52,5 @@ div#site-name {
 }
 
 #header-right-inner {
-  margin-top: 46px;
+  margin-top: 4em;
 }
diff --git a/sass/partials/common/_search-advanced.scss b/sass/partials/common/_search-advanced.scss
index bf10e63..2262541 100644
--- a/sass/partials/common/_search-advanced.scss
+++ b/sass/partials/common/_search-advanced.scss
@@ -54,7 +54,7 @@
 
 // sidebar search form
 #drupalorg-crosssite-search-form .form-text {
-  width: 150px;
+  width:  0.15625em; /* 150 / 960 */
 }
 
 // todo: check where is drupalorg_news block
diff --git a/sass/partials/common/_search-help.scss b/sass/partials/common/_search-help.scss
index 6e42c20..c082b32 100644
--- a/sass/partials/common/_search-help.scss
+++ b/sass/partials/common/_search-help.scss
@@ -13,6 +13,7 @@
   margin: 0 0 1em 0;
 }
 
+/* This will need conversion to em */
 #drupalorg-search-help-form .form-text {
   background: $white $icon-throbber 231px 8px no-repeat;
   border: 2px solid nth($greys, 9);
diff --git a/sass/partials/common/_search.scss b/sass/partials/common/_search.scss
index f1b0779..54ae9eb 100644
--- a/sass/partials/common/_search.scss
+++ b/sass/partials/common/_search.scss
@@ -9,7 +9,7 @@
   margin: 0 4px 0 0;
   *min-height: 18px; // Force IE7 to think properly about padding, ie8 understands border box so no prob
   padding: 10px 10px 10px 30px;
-  width: 275px;
+  width:  0.28645833em; /* 275 / 960 */
 }
 
 #header input[type="text"]::-webkit-input-placeholder {
@@ -49,7 +49,7 @@
 // Refine your search header form
 #search-theme-form-advanced {
   display: none;
-  width: 275px;
+  width: 0.28645833em; /* 275 / 960 */
   position: absolute;
 }
 
@@ -119,27 +119,27 @@ html.js #search-theme-form-advanced fieldset.collapsible .fieldset-wrapper {
 
 #search-theme-form-advanced .form-radios {
   padding-top: 0;
-  width: 275px;
+  width: 0.28645833em; /* 275 / 960 */
   position: relative;
 }
 
 #search-theme-form-advanced fieldset.collapsible .form-radios {
-  width: 255px;
+  width:  0.265625em; /* 255 / 960 */
 }
 
 #search-theme-form-advanced .form-radios .form-item {
   min-height: 1.538461em;
-  width: 135px;
+  width:  0.140625em; /* 135 / 960 */
 }
 
 #search-theme-form-advanced fieldset.collapsible .form-radios .form-item {
   font-size: 0.923076em;
-  width: 127px;
+  width:  0.1322917%; /* 127 / 960 */
 }
 
 #search-theme-form-advanced .form-radios .form-divider {
   float: left;
-  width: 127px;
+  width:  0.1322917%; /* 127 / 960 */
 }
 
 #search-theme-form-advanced .form-radios .form-item input {
diff --git a/sass/partials/common/_tags.scss b/sass/partials/common/_tags.scss
index e2b1f76..424fe71 100644
--- a/sass/partials/common/_tags.scss
+++ b/sass/partials/common/_tags.scss
@@ -3,13 +3,13 @@
  *
  * Wraps tags in rounded corners.
  * Used in source sites tags on the news page, feature tags, etc.
- * 
+ *
  * Tags should be inline and wrapped like this:
- * 
+ *
  * <span class="image-tags">
  * <span><a href="#">Tag</a></span>
  * </span>
- * 
+ *
  * The tags can have any color; make sure to give the
  * second span the background-color you want
  */
@@ -18,13 +18,13 @@
   background-color: $lighter-navy-blue;
   display: inline-block;
   font-size: .6em;
-  line-height: 18px;
+  line-height: 1.5em;
   padding-left: 4px;
 }
 .image-tags span a {
   color: $white;
   display: inline-block;
-  line-height: 18px;
+  line-height: 1.5em;
   padding-right: 4px;
 }
 
diff --git a/sass/partials/drupalorg/_about.scss b/sass/partials/drupalorg/_about.scss
index a44838b..1219cd6 100644
--- a/sass/partials/drupalorg/_about.scss
+++ b/sass/partials/drupalorg/_about.scss
@@ -10,7 +10,7 @@
 
 /* Bottom section of the About page */
 .page-node-1 .node-footer-section {
-  width: 940px;
+  width: 0.97917em; /* 940 / 960 */
 }
 
 /* todo: remove grid classes after upgrade */
@@ -29,7 +29,7 @@
 .aboutsmall {
   color: nth($greys, 1);
   font-size: 0.92307em; // 0.92307 * 13px = 12px
-  
+
   #content & {
     ul {
       list-style: none;
@@ -37,7 +37,7 @@
       padding-left: 0;
     }
   }
-  
+
   h3 {
     border-top: 1px solid nth($greys, 2);
     margin-top: 1em;
@@ -47,7 +47,7 @@
   dd {
     padding-left: 0;
   }
-  
+
   strong,
   dt {
     color: nth($greys, 1);
diff --git a/sass/partials/drupalorg/_casestudies.scss b/sass/partials/drupalorg/_casestudies.scss
index b8c4a8a..406baa6 100644
--- a/sass/partials/drupalorg/_casestudies.scss
+++ b/sass/partials/drupalorg/_casestudies.scss
@@ -53,11 +53,11 @@
   background: $pale-yellow;
   padding: 18px 16px 9px;
   float: left;
-  width: 620px;
+  width: 0.645833em; /* 620 / 960 */
   margin-bottom: 20px;
 }
 .view-drupalorg-casestudies .jcarousel-container .views-field-title h2 {
-  width: 465px;
+  width: 0.484375em; /* 465 / 960 */
   margin-top: 18px;
   float: left;
 }
diff --git a/sass/partials/drupalorg/_front-tabs.scss b/sass/partials/drupalorg/_front-tabs.scss
index 0f15066..f8d30b7 100644
--- a/sass/partials/drupalorg/_front-tabs.scss
+++ b/sass/partials/drupalorg/_front-tabs.scss
@@ -37,7 +37,7 @@
   color: $tabs-blue;
   display: block;
   float: left;
-  height: 32px;
+  height: 2em;
   padding: 5px 11px 0 11px;
 }
 
@@ -73,7 +73,7 @@
 #tab-forum-link:before,
 #tab-commits-link:before {
   content: '●';
-  font-size: 20px;
+  font-size: 1.66em;
   line-height: 0px; // to compensate for the larger font size
   margin-right: 5px;
   position: relative;
diff --git a/sass/partials/drupalorg/_front.scss b/sass/partials/drupalorg/_front.scss
index 32e158f..2843d02 100644
--- a/sass/partials/drupalorg/_front.scss
+++ b/sass/partials/drupalorg/_front.scss
@@ -30,7 +30,7 @@
 
 /* Case studies block */
 div.things-we-made-wrapper {
-  width: 300px;
+  width: 0.3125em; /* 300 / 960 */
   overflow: hidden;
   margin: 0 0 1em 0;
 }
diff --git a/sass/partials/drupalorg/_getting-started.scss b/sass/partials/drupalorg/_getting-started.scss
index 725deec..9f6bc7b 100644
--- a/sass/partials/drupalorg/_getting-started.scss
+++ b/sass/partials/drupalorg/_getting-started.scss
@@ -29,9 +29,9 @@
     font-size: 1.4em;
     white-space: nowrap;
     overflow: hidden;
-    width: 240px;
-    height: 49px;
-    max-height: 49px;;
+    width:  0.25em; /* 240 / 960 */
+    height: 4em;
+    max-height: 4em;
     padding: 12px 0 0 21px;
     color: nth($blues, 3);
     position: relative;
diff --git a/sass/partials/drupalorg/_maps.scss b/sass/partials/drupalorg/_maps.scss
index df8fa23..2401eff 100644
--- a/sass/partials/drupalorg/_maps.scss
+++ b/sass/partials/drupalorg/_maps.scss
@@ -10,7 +10,7 @@
 .homepage-map {
   background: $map-big;
   height: 250px;
-  width: 450px;
+  width: 0.46875em; /* 450 / 960 */
   white-space: nowrap;
 }
 .drupalorg-map-pin {
@@ -23,7 +23,7 @@
 .homepage-map .homepage-pin:before {
   content: '•';
   display: inline-block;
-  font-size: 20px;
+  font-size: 1.5384em; /* 1.5384 * 13px = 20px */
   height: 10px;
   left: -1px;
   margin-right: 5px;
diff --git a/sass/partials/drupalorg/_marketplace.scss b/sass/partials/drupalorg/_marketplace.scss
index 73cddbe..3f13661 100644
--- a/sass/partials/drupalorg/_marketplace.scss
+++ b/sass/partials/drupalorg/_marketplace.scss
@@ -86,12 +86,12 @@
 #marketplace-services-quicknav li.leaf a {
   display: block;
   padding: 0 12px 0 30px;
-  line-height: 36px;
+  line-height: 3em;
   color: $body-text;
   background: $light-grey $arrow-mask no-repeat 0 0;
   border-radius: 0 5px 5px 0;
 }
-#block-menu-menu-hosting-types-menu li.leaf a:hover, 
+#block-menu-menu-hosting-types-menu li.leaf a:hover,
 #block-menu-menu-hosting-types-menu li.leaf a:focus,
 #marketplace-services-quicknav li.leaf a:hover,
 #marketplace-services-quicknav li.leaf a:focus {
@@ -99,7 +99,7 @@
   text-decoration: none;
 }
 #block-menu-menu-hosting-types-menu li.leaf .active,
-#block-menu-menu-hosting-types-menu li.leaf .active:hover, 
+#block-menu-menu-hosting-types-menu li.leaf .active:hover,
 #block-menu-menu-hosting-types-menu li.leaf .active:focus,
 #marketplace-services-quicknav li.leaf.active-trail a,
 #marketplace-services-quicknav li.leaf.active-trail a:hover,
diff --git a/sass/partials/drupalorg/_member-directory.scss b/sass/partials/drupalorg/_member-directory.scss
index d7afb5c..a5435e1 100644
--- a/sass/partials/drupalorg/_member-directory.scss
+++ b/sass/partials/drupalorg/_member-directory.scss
@@ -8,5 +8,5 @@
   margin: 0;
 }
 #block-drupalorg_search-drupalorg_search_users .form-text {
-  width: 150px;
+  width: 0.15625em; /* 150 / 960 */
 }
diff --git a/template.php b/template.php
index e7b2ebc..1aa6063 100644
--- a/template.php
+++ b/template.php
@@ -1,9 +1,12 @@
 <?php
-
 /**
  * Preprocessor for page.tpl.php template file.
  */
 function bluecheese_preprocess_page(&$variables) {
+  $variables['drupalorg_logo_link'] = ''; // Not in public theme.
+  $variables['nav_masthead'] = '';  // Not in public theme.
+  $variables['nav_content'] = '';  // Not in public theme.
+
   // Add HTML tag name for title tag.
   $variables['site_name_element'] = $variables['is_front'] ? 'h1' : 'div';
 
diff --git a/tpl/comment.tpl.php b/tpl/comment.tpl.php
index 79ed91c..86c8b19 100644
--- a/tpl/comment.tpl.php
+++ b/tpl/comment.tpl.php
@@ -1,18 +1,20 @@
-<div class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
-  <?php print $picture ?>
+<article class="<?php print $classes; ?> clearfix"<?php print $attributes; ?> role="article">
+  <header class="comment-header">
+    <?php print $picture ?>
 
-  <?php print render($title_prefix); ?>
-  <h3<?php print $title_attributes; ?>><?php print $title ?></h3>
-  <?php print render($title_suffix); ?>
+    <?php print render($title_prefix); ?>
+    <h3<?php print $title_attributes; ?>><?php print $title ?></h3>
+    <?php print render($title_suffix); ?>
 
-  <?php print $permalink; ?>
+    <?php print $permalink; ?>
 
-  <div class="submitted">
-    <?php print $submitted; ?>
-    <?php if ($new): ?>
-      <span class="new"><?php print $new ?></span>
-    <?php endif; ?>
-  </div>
+    <div class="submitted">
+      <?php print $submitted; ?>
+      <?php if ($new): ?>
+        <span class="new"><?php print $new ?></span>
+      <?php endif; ?>
+    </div>
+  </header>
 
   <div class="content"<?php print $content_attributes; ?>>
     <?php
@@ -20,12 +22,16 @@
       hide($content['links']);
       print render($content);
     ?>
-    <?php if ($signature): ?>
-    <div class="user-signature clearfix">
-      <?php print $signature ?>
-    </div>
-    <?php endif; ?>
+    <footer class="comment-footer">
+      <?php if ($signature): ?>
+      <div class="user-signature clearfix">
+        <?php print $signature ?>
+      </div>
+      <?php endif; ?>
+    </footer>
   </div>
 
-  <?php print render($content['links']) ?>
-</div>
+  <nav>
+    <?php print render($content['links']) ?>
+  </nav>
+</article>
diff --git a/tpl/html.tpl.php b/tpl/html.tpl.php
index e50ea83..7e6c23f 100644
--- a/tpl/html.tpl.php
+++ b/tpl/html.tpl.php
@@ -40,10 +40,16 @@
  * @see template_preprocess_html()
  * @see template_process()
  */
-?><!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language; ?>" version="XHTML+RDFa 1.0" dir="<?php print $language->dir; ?>"<?php print $rdf_namespaces; ?>>
-<head profile="<?php print $grddl_profile; ?>">
+?>
+
+<!DOCTYPE html>
+<html lang="en" dir="<?php print $language->dir; ?>"<?php print $rdf_namespaces; ?> xmlns="http://www.w3.org/1999/xhtml">
+<head>
   <?php print $head; ?>
+  <meta name="MobileOptimized" content="width" />
+  <meta name="HandheldFriendly" content="true" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta http-equiv="cleartype" content="on" />
   <title><?php print $head_title; ?></title>
   <?php print $styles; ?>
   <?php print $scripts; ?>
diff --git a/tpl/node.tpl.php b/tpl/node.tpl.php
index 65e6cfc..edfa8e7 100644
--- a/tpl/node.tpl.php
+++ b/tpl/node.tpl.php
@@ -1,18 +1,20 @@
-<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
+<article id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?> role="article">
+  <header>
+    <?php print render($title_prefix); ?>
 
-  <?php print $user_picture; ?>
+    <?php print $user_picture; ?>
 
-  <?php print render($title_prefix); ?>
-  <?php if (!$page): ?>
-    <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
-  <?php endif; ?>
-  <?php print render($title_suffix); ?>
+    <?php if (!$page): ?>
+      <h2<?php print $title_attributes; ?>><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
+    <?php endif; ?>
+    <?php print render($title_suffix); ?>
 
-  <?php if ($display_submitted): ?>
-    <div class="submitted">
-      <?php print $submitted; ?>
-    </div>
-  <?php endif; ?>
+    <?php if ($display_submitted): ?>
+      <div class="submitted">
+        <?php print $submitted; ?>
+      </div>
+    <?php endif; ?>
+  </header>
 
   <div class="content"<?php print $content_attributes; ?>>
     <?php
@@ -23,9 +25,11 @@
     ?>
   </div>
 
-  <?php print render($content['links']); ?>
+  <footer class="link-wrapper">
+    <?php print render($content['links']); ?>
+  </footer>
 
-
-</div>
+</article>
 
 <?php print render($content['comments']); ?>
+
diff --git a/tpl/page.tpl.php b/tpl/page.tpl.php
index 59d5da7..9dcab6b 100644
--- a/tpl/page.tpl.php
+++ b/tpl/page.tpl.php
@@ -1,12 +1,12 @@
   <?php if ($drupalorg_site_status): ?>
   <div id="drupalorg-site-status"><?php print $drupalorg_site_status; ?></div>
   <?php endif; ?>
-  <div id="header" class="clearfix">
+  <header id="header" class="clearfix" role="banner">
     <div id="header-screen" class="clearfix">
       <div id="header-inner" class="container-12 clearfix">
-        <div id="nav-header" role="navigation">
+        <nav id="nav-header" role="navigation">
           <?php print render($page['navigation']); ?>
-        </div> <!-- /#nav-header -->
+        </nav> <!-- /#nav-header -->
 
         <div id="header-content">
           <div id="header-left">
@@ -23,12 +23,12 @@
           </div> <!-- /#header-right -->
         </div> <!-- /#header-content -->
 
-        <div id="nav-masthead" role="navigation">
+        <nav id="nav-masthead" role="navigation">
           <?php print $nav_masthead; ?>
-        </div> <!-- /#nav-masthead -->
+        </nav> <!-- /#nav-masthead -->
       </div> <!-- /#header-inner -->
     </div>
-  </div> <!-- /#header -->
+  </header>
 
   <div id="page" class="container-12 clearfix">
     <div id="page-inner">
@@ -73,7 +73,7 @@
 
       </div> <!-- /#page-heading -->
 
-      <div id="main" role="main">
+      <main id="main" role="main"><section class="section">
         <?php if ($tabs['#primary']): ?>
           <div id="tabs" class="clearfix">
             <?php print render($tabs); ?>
@@ -95,8 +95,7 @@
             <div id="feeds">Subscribe with RSS <?php print $feed_icons; ?></div>
           <?php endif; ?>
         </div> <!-- /#content -->
-
-      </div> <!-- /#column-left -->
+      </section></main> <!-- /#column-left -->
 
       <?php if ($page['sidebar_second']): ?>
         <div id="aside" role="complementary" >
@@ -113,15 +112,16 @@
       <?php endif; // end if $content_bottom ?>
     </div> <!-- /#page-inner -->
   </div> <!-- /#page -->
-
-  <div id="footer" role="contentinfo">
-    <div id="footer-inner" class="container-12 clearfix">
-      <?php if ($page['footer']): ?>
-        <div id="footer-region">
-          <div id="footer-region-inner" class="clearfix">
-            <?php print render($page['footer']); ?>
-          </div> <!-- /#footer-region-inner -->
-        </div> <!-- /#footer-region -->
-      <?php endif; // end if $nav_footer ?>
-    </div> <!-- /#footer-inner -->
-  </div> <!-- /#footer -->
+  <div id="footer-wrapper"><footer class="section">
+    <div id="footer" role="contentinfo">
+      <div id="footer-inner" class="container-12 clearfix">
+        <?php if ($page['footer']): ?>
+          <div id="footer-region">
+            <div id="footer-region-inner" class="clearfix">
+              <?php print render($page['footer']); ?>
+            </div> <!-- /#footer-region-inner -->
+          </div> <!-- /#footer-region -->
+        <?php endif; // end if $nav_footer ?>
+      </div> <!-- /#footer-inner -->
+    </div> <!-- /#footer -->
+  </footer></div> <!-- /.section, /#footer-wrapper -->