diff --git a/templates/_google_analytics.html b/templates/_google_analytics.html
index bcdf492..fa1c333 100644
--- a/templates/_google_analytics.html
+++ b/templates/_google_analytics.html
@@ -1,5 +1,5 @@
-<!-- Google Analytics -->
-<script type="text/javascript">
+  <!-- Google Analytics -->
+  <script type="text/javascript">
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
@@ -7,6 +7,4 @@
 
     ga('create', '{{ GOOGLE_ANALYTICS[0] }}', '{{ GOOGLE_ANALYTICS[1] }}');
     ga('send', 'pageview');
-
-</script>
-
+  </script>
diff --git a/templates/_google_search.html b/templates/_google_search.html
new file mode 100644
index 0000000..e264902
--- /dev/null
+++ b/templates/_google_search.html
@@ -0,0 +1,17 @@
+        <h3>Site Search</h3>
+        <div class="google_search">
+          <script>
+            (function() {
+              var cx = '{{ GOOGLE_SEARCH }}';
+              var gcse = document.createElement('script');
+              gcse.type = 'text/javascript';
+              gcse.async = true;
+              gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+                '//www.google.com/cse/cse.js?cx=' + cx;
+              var s = document.getElementsByTagName('script')[0];
+              s.parentNode.insertBefore(gcse, s);
+            })();
+          </script>
+          <gcse:search></gcse:search>
+        </div>
+
diff --git a/templates/_gosquared.html b/templates/_gosquared.html
index 47e5909..f7e66fe 100644
--- a/templates/_gosquared.html
+++ b/templates/_gosquared.html
@@ -1,17 +1,18 @@
-<!-- GoSquared Tracking -->
-<script type="text/javascript">
-var GoSquared = {};
-GoSquared.acct = "{{ GO_SQUARED }}"; // account number
-(function(w){
-  function gs(){
-    w._gstc_lt = +new Date;
-    var d = document, g = d.createElement("script");
-    g.type = "text/javascript";
-    g.src = "//d1l6p2sc9645hc.cloudfront.net/tracker.js";
-    var s = d.getElementsByTagName("script")[0];
-    s.parentNode.insertBefore(g, s);
-  }
-  w.addEventListener ?
-    w.addEventListener("load", gs, false) :
-    w.attachEvent("onload", gs);
-})(window);
+  <!-- GoSquared Tracking -->
+  <script type="text/javascript">
+    var GoSquared = {};
+    GoSquared.acct = "{{ GO_SQUARED }}"; // account number
+    (function(w){
+      function gs(){
+        w._gstc_lt = +new Date;
+        var d = document, g = d.createElement("script");
+        g.type = "text/javascript";
+        g.src = "//d1l6p2sc9645hc.cloudfront.net/tracker.js";
+        var s = d.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(g, s);
+      }
+      w.addEventListener ?
+      w.addEventListener("load", gs, false) :
+      w.attachEvent("onload", gs);
+    })(window);
+  </script>
diff --git a/templates/_list_item.html b/templates/_list_item.html
new file mode 100644
index 0000000..1dccfa5
--- /dev/null
+++ b/templates/_list_item.html
@@ -0,0 +1,41 @@
+<li class="row">
+  <div class="article">
+    <div class="small-4 columns">
+      {% if article.image %}
+      <a class="th" href="{{ SITEURL }}/{{ article.url }}"><img src="{{ SITEURL }}/static/{{article.image}}"/></a>
+      {% else %}
+      <a class="th" href="{{ SITEURL }}/{{ article.url }}"><img src="{{ SITEURL }}/{{ FAVICON }}"/></a>
+      {% endif %}
+    </div>
+    <div class="small-12 columns">
+      <header>
+        <h3><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title|title }}</a></h3>
+        {% if not category %}
+        <div><span>Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></span></div>
+        {% endif %}
+        {% if not tag and article.tags -%}
+        <div>
+          <span><a title="Tags" href="{{ SITEURL }}/tags.html"><i class="large icon-tag"></i>&nbsp;</a></span>
+          <ul class="tag-list">
+            {% for tag in article.tags %}
+            <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
+            {% endfor %}
+          </ul>
+        </div>
+        {% endif %}
+      </header>
+      <div class="summary"> 
+        {{ article.summary }}
+        <span><a href="{{ SITEURL }}/{{ article.url }}" title="Continue Reading"><i class="icon-dot-3"></i></a></span>
+      </div>
+      <footer>
+        <ul class="no-bullet">
+          <li>Published by <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a> on: <abbr class="published" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</abbr></li>
+          {% if article.modified %}
+          <li>Last Modified on: <abbr title="{{ article.modified }}">{{ article.modified }}</abbr></li>
+          {% endif %}
+        </ul>      
+      </footer>
+    </div>
+  </div>
+</li>
diff --git a/templates/_site_social.html b/templates/_site_social.html
deleted file mode 100644
index 647b115..0000000
--- a/templates/_site_social.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for network, url in SOCIAL %}
-<li><a href="{{ url }}" title="{{ network|title }}"><i class="huge icon-{{ network }}"></i></a></li>
-{% endfor %}
diff --git a/templates/archives.html b/templates/archives.html
index 88445f1..4c8d8bc 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -1,10 +1,24 @@
 {% extends 'base.html' %}
 {% block title %}{{ super() }} - Archives{% endblock %}
-{% block content_title %}Archives{% endblock %}
+{% block content_title %}<a href="{{ SITEURL }}/archives.html" rel="bookmark" title="Permalink to archives">Archives</a>{% endblock %}
 {% block content %}
-<ul class="no-bullet">
+<dl class="article-list">
 {% for article in articles %}
-<li>{{ article.title|title }} - {{ article.date }}</li>
+<dt><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dt>
+<dd>Published: <abbr class="published" title="{{ article.date.isoformat() }}">{{ article.locale_date }}</abbr> by <a href="{{ SITEURL }}/{{ article.author.url }}">{{ article.author }}</a></dd>
+{% if article.modified %}
+<dd>Last modified on: <abbr class="modified" title="{{article.modified}}">{{ article.modified }}</abbr></dd>
+{% endif %}
+<dd>Category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></dd>
+{% if article.tags %}
+<dd>Tags: 
+{% for tag in article.tags %}
+<a href="{{ SITEURL }}/{{ tag.url }}">{{tag}}</a>
+{% if not loop.last %}
+,
+{% endif %} 
+{% endfor %}</dd>
+{% endif %}
 {% endfor %}
-</ul>
+</dl>
 {% endblock %}
diff --git a/templates/base.html b/templates/base.html
index e36581c..ef62330 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -14,115 +14,136 @@
   
   <!-- Stylesheets -->
   <link rel="stylesheet" href="{{ SITEURL }}/theme/css/app.css" />
+
+  <!-- Fonts -->
+  <link href='http://fonts.googleapis.com/css?family=Source+Code+Pro|Open+Sans' rel='stylesheet' type='text/css'> 
   
   <!-- Favicon -->
   <link rel="shortcut icon" href="{{ SITEURL }}/{{ FAVICON }}" /> 
 
   <!-- RSS/ATOM -->
-  {% if FEED -%}
+  {% if FEED_ATOM -%}
   <link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
   {% endif %}
   {%if FEED_RSS -%}
   <link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
   {% endif %}
+  {% if FEED_ALL_ATOM -%}
+  <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full ATOM Feed" />
+  {% endif %}
+  {%if FEED_ALL_RSS -%}
+  <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Full RSS Feed" />
+  {% endif %}
+  {% if CATEGORY_FEED_ATOM and category -%}
+  <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Categories ATOM Feed" />
+  {% endif %}
+  {%if CATEGORY_FEED_RSS and category -%}
+  <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
+  {% endif %}
+  {% if TAG_FEED_ATOM and tag -%}
+  <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
+  {% endif %}
+  {%if TAG_FEED_RSS and tag -%}
+  <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+  {% endif %}
   
   <!-- Modernizr -->
   <script data="{{ SITEURL }}/theme/js/vendor/" src="{{ SITEURL }}/theme/js/vendor/custom.modernizr.js"></script>
 </head>
 <body>
-    <header id="nav" class="contain-to-grid">
-        <nav class="top-bar">
-            <ul class="title-area">
-                <!-- Title Area -->
-                <li class="name">
-                    <h1><a href="{{ SITEURL }}">{{ SITENAME }}</a></h1>
-                </li>
-                <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+  <header id="nav" class="contain-to-grid">
+    <nav class="top-bar">
+      <ul class="title-area">
+        <!-- Title Area -->
+        <li class="name">
+          <h1><a href="{{ SITEURL }}">{{ SITENAME }}</a></h1>
+        </li>
+        <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
+      </ul>
+      <section class="top-bar-section">
+      <!-- Menu -->
+        <ul class="left">
+          {% for item, url in MENUITEMS %}
+          <li><a href="{{ url }}">{{ item|title }}</a></li>
+          {% endfor %}                    
+          {% if DISPLAY_PAGES_ON_MENU != False %}
+          {% if DISPLAY_PAGES_ON_MENU == 'Compact' %}
+          <li class="has-dropdown"><a href="#">Pages</a>
+            <ul class="dropdown">
+              {% for p in PAGES %}
+              <li {% if p == page %} class='active'{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
+              {% endfor %}
             </ul>
-            <section class="top-bar-section">
-                <!-- Menu -->
-                <ul class="left">
-                  {% for item, url in MENUITEMS %}
-                  <li><a href="{{ url }}">{{ item|title }}</a></li>
-                  {% endfor %}                    
-                  {% if DISPLAY_PAGES_ON_MENU != False %}
-                    {% if DISPLAY_PAGES_ON_MENU == 'Compact' %}
-                        <li class="has-dropdown"><a href="#">Pages</a>
-                            <ul class="dropdown">
-                                {% for p in PAGES %}
-                                    <li {% if p == page %} class='active'{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
-                                {% endfor %}
-                            </ul>
-                    {% endif %}
-                    {% if DISPLAY_PAGES_ON_MENU == 'Expanded' %}
-                        {% for p in PAGES %}
-                            <li {% if p == page %} class='active'{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
-                        {% endfor %}
-                    {% endif %}
-                    </li>
-                  {% endif %}
-                  {% if DISPLAY_CATEGORIES_ON_MENU != False %}
-                    {% if DISPLAY_CATEGORIES_ON_MENU == 'Compact' %}
-                    <li class="has-dropdown"><a href="#">Categories</a>
-                            <ul class="dropdown">
-                                {% for cat, null in categories %}
-                                    <li {% if cat == category %} class='active'{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat.name|title }}</a></li>
-                                {% endfor %}
-                            </ul>
-                    {% endif %}
-                    {% if DISPLAY_CATEGORIES_ON_MENU == 'Expanded' %}
-                        {% for cat, null in categories %}
-                            <li {% if cat == category %} class='active'{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat.name|title }}</a></li>
-                        {% endfor %}
-                    {% endif %}
-                    </li>
-                  {% endif %}
-                  <li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
-                </ul>
-                <!-- Social Links -->
-                <ul class="right">
-                    {% if SOCIAL %}
-                        {% include '_site_social.html' %}
-                    {% endif %}
-                </ul>
-            </section>
-        </nav>
-    </header>
-    <!-- Content Area -->
-    <div class="row">
-        <div id="main" class="large-13 columns push-3">
-            <section>
-                <header>
-                    <h1>{% block content_title %}{% endblock %}</h1>
-                    {% block content_image %}{% endblock %}
-                </header>
-                {% block content %}
-                    <ul class="no-bullet">
-                    {% for article in articles_page.object_list %}
-                        <li><article>
-                            <header><h1>{{ article.title|title }}</h1></header>
-                            {{ article.summary }}
-                            <footer>{{ article.author }}</footer>
-                        </article></li>
-                    {% endfor %}
-                    </ul>
-                {% endblock %}
-            </section>
-        </div>
-        <div id="mainAside" class="large-3 columns pull-13">
-        <aside>
-        {% block aside %}
-            <h3>Blog Links</h3>
-            <ul id='blogRoll' class="no-bullet">
-            {% for link in LINKS %}
-                <li><a href="{{ link[1] }}">{{ link[0] }}</a></li>
-            {% endfor %}
+          </li>
+          {% endif %}
+          {% if DISPLAY_PAGES_ON_MENU == 'Expanded' %}
+          {% for p in PAGES %}
+          <li {% if p == page %} class='active'{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
+          {% endfor %}
+          {% endif %}
+          {% endif %}
+          {% if DISPLAY_CATEGORIES_ON_MENU != False %}
+          {% if DISPLAY_CATEGORIES_ON_MENU == 'Compact' %}
+          <li class="has-dropdown"><a href="#">Categories</a>
+            <ul class="dropdown">
+              {% for cat, null in categories %}
+              <li {% if cat == category %} class='active'{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat.name|title }}</a></li>
+              {% endfor %}
             </ul>
+          </li>
+          {% endif %}
+          {% if DISPLAY_CATEGORIES_ON_MENU == 'Expanded' %}
+          {% for cat, null in categories %}
+          <li {% if cat == category %} class='active'{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat.name|title }}</a></li>
+          {% endfor %}
+          {% endif %}
+          {% endif %}
+          <li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
+        </ul>
+        <!-- Social Links -->
+        <ul class="right">
+          {% if SOCIAL %}
+          {% for network, url in SOCIAL %}
+          <li><a href="{{ url }}" title="{{ network|title }}"><i class="huge icon-{{ network }}"></i></a></li>
+          {% endfor %}
+          {% endif %}
+        </ul>
+      </section>
+    </nav>
+  </header>
+  <!-- Content Area -->
+  <div class="row">
+    <div id="main" class="large-13 columns push-3">
+      <section>
+        <header>
+          <h1>{% block content_title %}{% endblock %}</h1>
+          {% block content_image %}{% endblock %}
+        </header>
+        {% block content %}
+        <ul class="article-list">
+          {% for article in articles_page.object_list %}
+          {% include '_list_item.html' %}
+          {% endfor %}
+        </ul>
         {% endblock %}
-        </aside>
-        </div>
-      </div>
-
+      </section>
+    </div>
+    <div id="mainAside" class="large-3 columns pull-13">
+      <aside>
+        {% block aside %}
+        {% if GOOGLE_SEARCH %}
+        {% include '_google_search.html' %}
+        {% endif %}
+        <h3>Blog Links</h3>
+        <ul id='blogRoll' class="no-bullet">
+          {% for link in LINKS %}
+          <li><a href="{{ link[1] }}">{{ link[0] }}</a></li>
+          {% endfor %}
+        </ul>
+        {% endblock %}
+      </aside>
+    </div>
+  </div>
   <footer class="row">
     <div class="large-16 columns" id="mainFooter">
       <span>&copy; {{ AUTHOR }} 2013</span>
@@ -132,10 +153,26 @@ <h3>Blog Links</h3>
   
   <!-- Tracking Code -->
   {% if GOOGLE_ANALYTICS %}
-    {% include _google_analytics.html %}
+  {% include '_google_analytics.html' %}
   {% endif %}
   {% if GO_SQUARED %}
-    {% include _gosquared.html %}
+  {% include '_gosquared.html' %}
+  {% endif %}
+
+  <!-- Comment Count -->
+  {% if DISQUS_SN %}
+  <script type="text/javascript">
+    /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+    var disqus_shortname = '{{DISQUS_SN}}'; // required: replace example with your forum shortname
+
+    /* * * DON'T EDIT BELOW THIS LINE * * */
+    (function () {
+      var s = document.createElement('script'); s.async = true;
+      s.type = 'text/javascript';
+      s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+      (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+    }());
+  </script>
   {% endif %}
 </body>
 </html>
diff --git a/templates/index.html b/templates/index.html
index 60e1072..5c4455d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,5 +1,24 @@
 {% extends 'base.html' %}
-{% block content %}
-
-
+{% block content_title %}
+<a href="{{ SITEURL }}/index.html" rel="bookmark">{{ SITENAME }}</a>
+{% endblock %}
+{% block content %}
+<p>{{ SITE_DESCR }}</p>
+{% if articles and ARTICLES_ON_INDEX %}
+<h2>Recent Articles:</h2>
+<ul class="article-list">
+{% for article in articles[0:ARTICLES_ON_INDEX] %}
+{% include '_list_item.html' %}
+{% endfor %}
+</ul>
+<p><a href="{{ SITEURL }}/archives.html">View more articles in the Archives...</a></p>
+{% endif %}
+{% if pages and PAGES_ON_INDEX %}
+<h2>Pages:</h2>
+<ul class="inline-list">
+{% for page in pages %}
+  <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
+{% endfor %}
+</ul>
+{% endif %}
 {% endblock %}
diff --git a/templates/period_archives.html b/templates/period_archives.html
deleted file mode 100644
index 0cd57f0..0000000
--- a/templates/period_archives.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends 'base.html' %}
-  
-{% block content %}
-{% endblock %}
\ No newline at end of file
diff --git a/templates/tags.html b/templates/tags.html
index 751a06a..bf08196 100644
--- a/templates/tags.html
+++ b/templates/tags.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% block title %}{{ super() }} - Tags{% endblock %}
-{% block content_title %}Tags{% endblock %}
+{% block content_title %}<a href="{{ SITEURL }}/tags.html" rel="bookmark">Tags</a>{% endblock %}
 {% block content %}
 <p>A list of all tags with article counts is below:</p>
 <ul class="tag-list">