8 files changed, 46 insertions, 37 deletions
diff --git a/source/_includes/article.html b/source/_includes/article.html
index aa7f8194..92f06720 100644
--- a/source/_includes/article.html
+++ b/source/_includes/article.html
@@ -1,18 +1,21 @@
 <header>
+  <h1><a href="{{ page.url }}">{{ page.title }}</a></h1>
   <p>
-    <time>{{ page.date | ordinalize }}</time>
     {% if site.author or site.author == page.author %}
-      <span class="byline"><em>by</em> <span class="author">{{ site.author }}</span></span>
+      <span class="byline author vcard">By <span class="fn">{{ site.author }}</span></span>
     {% elsif page.author %}
-      <span class="byline"><em>by</em> <span class="author">{{ page.author }}</span></span>
+      <span class="byline author vcard">By <span class="fn">{{ page.author }}</span></span>
+    {% endif %}
+    {% if page.date %}
+      <time datetime="{{ page.date | datetime }}" pubdate>{{ page.date | ordinalize }}</time>
+    {% endif %}
+    {% if page.updated %}
+      <time class="updated" datetime="{{ page.updated | datetime }}" pubdate>Updated {{ page.updated | ordinalize }}</time>
     {% endif %}
   </p>
-  <h1><a href="{{ page.url }}">{{ page.title }}</a></h1>
 </header>
 {% if index %}
 <div class="entry">{{ content | exerpt(content, page.url, 'Continue reading &raquo;') | smart_quotes }}</div>
 {% else %}
 <div class="entry">{{ content | smart_quotes }}</div>
 {% endif %}
-
-{% if page.updated %}<p class="updated"><em>updated</em> <time>{{ page.updated | ordinalize }}</time></p>{% endif %}
diff --git a/source/_includes/delicious.html b/source/_includes/delicious.html
index 8e97b0fd..02b9e6bd 100644
--- a/source/_includes/delicious.html
+++ b/source/_includes/delicious.html
@@ -1,3 +1,3 @@
-<h4>On Delicious</h4>
+<h1>On Delicious</h1>
 <script type="text/javascript" src="http://feeds.delicious.com/v2/js/{{ site.delicious_user }}?title=&count={{ site.delicious_count }}&sort=date&extended"></script>
 <p><a href="http://delicious.com/{{ site.delicious_user }}">My Delicious Bookmarks &raquo;</a></p>
diff --git a/source/_includes/head.html b/source/_includes/head.html
index 4a3fb31c..1d3329ba 100644
--- a/source/_includes/head.html
+++ b/source/_includes/head.html
@@ -1,26 +1,25 @@
 <head>
+  <meta charset="utf-8">
+
   <title>{{page.title}} - {{site.title}}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <meta name="author" content="{{site.author}}">
   {% if page.description %}
     <meta name="description" content="{{page.description}}"/>
   {% endif %}
+
+  <!-- http://t.co/dKP3o1e -->
+  <meta name="HandheldFriendly" content="True">
+  <meta name="MobileOptimized" content="320">
+  <meta name="viewport" content="width=device-width, target-densitydpi=160dpi, initial-scale=1">
+
   {% if page.keywords %}
     <meta name="keywords" content="{{page.keywords}}"/>
   {% endif %}
+
   <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
-  <script src="/javascripts/mootools-yui-compressed.js" type="text/javascript"></script>
-  <script src="/javascripts/mootools-more-1.3.1.1.js" type="text/javascript"></script>
-  <script src="/javascripts/octopress.js" type="text/javascript"></script>
-  <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-  <meta name="viewport" content="initial-scale=1.0 width=device-width">
-  {% if site.twitter_user %}
-    <script>
-      var twitter_user = "{{site.twitter_user}}";
-      var show_replies = {{site.show_replies}};
-      var tweet_count = {{site.tweet_count}};
-    </script>
-    <script src="/javascripts/twitter.js" type="text/javascript"></script>
-  {% endif %}
+  <!--<script src="/javascripts/octopress.js" type="text/javascript"></script>-->
+  <script src="javascripts/libs/modernizr-1.7.min.js"></script>
+  <script src="javascripts/libs/ios-viewport-scaling-bug-fix.js"></script>
   {% if site.google_analytics_tracking_id %}
     {% include google_analytics.html %}
   {% endif %}
diff --git a/source/_includes/header.html b/source/_includes/header.html
index 4c35d0b8..4e0519e6 100644
--- a/source/_includes/header.html
+++ b/source/_includes/header.html
@@ -1,10 +1 @@
 <h1><a href="/">{{ site.title }}</a></h1>
-{% if site.google_custom_search_id && site.google_custom_search_id %}
-  <div id="search">
-    <form action="http://www.google.com/cse" id="cse-search-box">
-      <input type="hidden" name="cx" value="{{ site.google_custom_search_id }}">
-      <input type="hidden" name="ie" value="UTF-8">
-      <input#q type="text" name="q">
-    </form>
-  </div>
-{% endif %}
diff --git a/source/_includes/navigation.html b/source/_includes/navigation.html
index 97d95938..23f594eb 100644
--- a/source/_includes/navigation.html
+++ b/source/_includes/navigation.html
@@ -1,5 +1,11 @@
+<div>
+  <a href="/atom.xml">Subscribe</a>
+  <form action="{{ site.simple_search }}" method="get">
+    <input class="search" type="text" name="q" results="0" placeholder="Search"/>
+    <input type="hidden" name="q" value="site:{{ site.url | search_url }}" />
+  </form>
+</div>
 <ul>
   <li><a href="/">Blog</a></li>
   <li><a href="/about/">About</a></li>
-  <li class="subscribe"><a href="/atom.xml">Subscribe</a></li>
 </ul>
diff --git a/source/_includes/pinboard.html b/source/_includes/pinboard.html
index 602645c5..3cd269d0 100644
--- a/source/_includes/pinboard.html
+++ b/source/_includes/pinboard.html
@@ -1,3 +1,3 @@
-<h4>My Pinboard</h4>
+<h1>My Pinboard</h1>
 <ul id="pinboard_linkroll">Fetching linkroll...</ul>
 <p><a href="http://pinboard.in/u:{{ site.pinboard_user }}">My Pinboard Bookmarks &raquo;</a></p>
diff --git a/source/_includes/sidebar.html b/source/_includes/sidebar.html
index 86f659b5..c5e3bd01 100644
--- a/source/_includes/sidebar.html
+++ b/source/_includes/sidebar.html
@@ -1,8 +1,10 @@
-<h4>About Me</h4>
-<p> Yo everybody! </p>
+<section>
+  <h1>About Me</h1>
+  <p>Hi, I'm Octopress!</p>
+</section>
 {% if site.recent_posts %}
 <section>
-  <h4>Recent Posts</h4>
+  <h1>Recent Posts</h1>
   <ul id="recent_posts">
     {% for post in site.posts limit: site.recent_posts %}
       <li class="post">
diff --git a/source/_includes/twitter.html b/source/_includes/twitter.html
index 4d688480..81f2cebd 100644
--- a/source/_includes/twitter.html
+++ b/source/_includes/twitter.html
@@ -1,5 +1,13 @@
-<h4>On Twitter</h4>
+<h1>Latest Tweets</h1>
 <ul id="tweets">
   Status updating...
 </ul>
-<p>Follow <a href="http://twitter.com/#{page.twitter_user}">@{{ site.twitter_user }}</a></p>
+<p>Follow <a href="http://twitter.com/{{site.twitter_user}}">@{{ site.twitter_user }}</a></p>
+{% if site.twitter_user %}
+  <script>
+    var twitter_user = "{{site.twitter_user}}";
+    var show_replies = {{site.show_replies}};
+    var tweet_count = {{site.tweet_count}};
+  </script>
+  <script src="/javascripts/twitter.js" type="text/javascript"></script>
+{% endif %}