diff --git a/templates/_article_footer.html b/templates/_article_footer.html
new file mode 100644
index 0000000..4f42c91
--- /dev/null
+++ b/templates/_article_footer.html
@@ -0,0 +1,14 @@
+{#  Items to include at the bottom of a single article #}
+{# PDF links #}
+{% if PDF_PROCESSOR %}
+    <a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">PDF</a>
+{% endif %}
+{# Copyright notice and link #}
+{% if COPYRIGHTS and (COPYRIGHT_ARTICLE or article.copyright) %}
+    <a href="{{ COPYRIGHTS[article.copyright|default(DEFAULT_COPYRIGHT)][1] }}">{{ COPYRIGHTS[article.copyright|default(DEFAULT_COPYRIGHT)][0] }}</a>
+{% endif %}
+{# Comments #}
+{% if ( article.comments == True or ( article.comments is not defined and COMMENTS_ARTICLE == True ) ) and  DISQUS_SN %}
+    {% include '_disqus.html' %}
+{% endif %}
+
diff --git a/templates/disqus.html b/templates/_disqus.html
similarity index 92%
rename from templates/disqus.html
rename to templates/_disqus.html
index c4a7670..20b44b0 100644
--- a/templates/disqus.html
+++ b/templates/_disqus.html
@@ -2,7 +2,6 @@
   <div class="large-9 columns">
     <div id="disqus_thread"></div><!--
     <script type="text/javascript">
-        /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
         var disqus_shortname = '{{ DISQUS_SN }}'; // required: replace example with your forum shortname
         var disqus_identifier = '{{ article.title }}_{{ article.date.isoformat() }}';
         var disqus_title = '{{ article.title }}';
@@ -18,4 +17,4 @@
     <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
     <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
   </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/templates/_google_analytics.html b/templates/_google_analytics.html
new file mode 100644
index 0000000..bcdf492
--- /dev/null
+++ b/templates/_google_analytics.html
@@ -0,0 +1,12 @@
+<!-- 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)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', '{{ GOOGLE_ANALYTICS[0] }}', '{{ GOOGLE_ANALYTICS[1] }}');
+    ga('send', 'pageview');
+
+</script>
+
diff --git a/templates/gosquared.html b/templates/_gosquared.html
similarity index 89%
rename from templates/gosquared.html
rename to templates/_gosquared.html
index ec46bdb..47e5909 100644
--- a/templates/gosquared.html
+++ b/templates/_gosquared.html
@@ -1,7 +1,7 @@
 <!-- GoSquared Tracking -->
 <script type="text/javascript">
 var GoSquared = {};
-GoSquared.acct = "{{ GS_CODE }}"; // account number
+GoSquared.acct = "{{ GO_SQUARED }}"; // account number
 (function(w){
   function gs(){
     w._gstc_lt = +new Date;
diff --git a/templates/_page_footer.html b/templates/_page_footer.html
new file mode 100644
index 0000000..d4a1701
--- /dev/null
+++ b/templates/_page_footer.html
@@ -0,0 +1,14 @@
+{#  Items to include at the bottom of a single page #}
+{# PDF links #}
+{% if PDF_PROCESSOR %}
+    <a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">PDF</a>
+{% endif %}
+{# Copyright notice and link #}
+{% if COPYRIGHTS and (COPYRIGHT_PAGE or page.copyright) %}
+    <a href="{{ COPYRIGHTS[page.copyright|default(DEFAULT_COPYRIGHT)][1] }}">{{ COPYRIGHTS[page.copyright|default(DEFAULT_COPYRIGHT)][0] }}</a>
+{% endif %}
+{# Comments #}
+{% if ( page.comments == True or ( page.comments is not defined and COMMENTS_PAGE == True ) ) and  DISQUS_SN %}
+    {% include '_disqus.html' %}
+{% endif %}
+
diff --git a/templates/_site_social.html b/templates/_site_social.html
new file mode 100644
index 0000000..c5194fc
--- /dev/null
+++ b/templates/_site_social.html
@@ -0,0 +1,5 @@
+<ul class="social-area">
+  {% for network, url in SOCIAL %}
+    <li><a href="{{ url }}"><i class="huge icon-{{ network }}"></i></a></li>
+  {% endfor %}
+</ul>
diff --git a/templates/google_analytics.html b/templates/google_analytics.html
deleted file mode 100644
index 05404ea..0000000
--- a/templates/google_analytics.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- Google Analytics -->
-<script type="text/javascript">
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', '{{ GA_CODE }}']);  //account #
-_gaq.push(['_setDomainName', '{{ GA_DOMAIN }}']); //subdomains of rangertbc.net
-{% if GA_LINKER == True %}
-_gaq.push(['_setAllowLinker', true]); // multiple top-level domains true
-{% endif %}
-_gaq.push(['_trackPageview']);
-(function() {
-  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
diff --git a/templates/site_social.html b/templates/site_social.html
deleted file mode 100644
index be2e0ba..0000000
--- a/templates/site_social.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<ul class="social-area">
-  <li><a href=""><i class="huge icon-gplus-1"></i></a></li>
-  <li><a href=""><i class="huge icon-twitter-1"></i></a></li>
-  <li><a href=""><i class="huge icon-github-circled-2"></i></a></li>
-  <li><a href=""><i class="huge icon-linkedin"></i></a></li>
-</ul>
\ No newline at end of file