Import template layer
diff --git a/theme/templates/base.html b/theme/templates/base.html
index 3d69679..b59631a 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -9,11 +9,11 @@
 
   {% block base %}{% endblock %}
   {% assets filters="pyscss,cssmin", output="css/styles.%(version)s.min.css", "css/style.scss", "css/pygments.css" %}
-  <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ ASSET_URL }}">
+  <link rel="stylesheet" type="text/css" href="{{ THEMEURL }}/{{ ASSET_URL }}">
   {% endassets %}
 
   {% assets filters="slimit", output="js/scripts.%(version)s.min.js", "js/lw-timeago/lw-timeago.js", "js/scroll.js", "js/email.js" %}
-  <script src="{{ SITEURL }}/{{ ASSET_URL }}" type="text/javascript"></script>
+  <script src="{{ THEMEURL }}/{{ ASSET_URL }}" type="text/javascript"></script>
   {% endassets%}
 
   <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet">
@@ -88,6 +88,7 @@
 
   {%- elif '.stackexchange.com' in temp %}{% set class = 'fa-stack-exchange' %}
   {% elif '.tumblr.com' in temp %}{% set class = 'fa-tumblr' %}
+  {% elif 'debian.org' in temp %}{% set class = 'fa fa-linux fa-lg' %}
   {% endif -%}
 
   <i class="fa {{ class }} fa-lg"></i>
@@ -110,17 +111,21 @@
         {% endif %}
       </a>
       <h2><a href="{{ SITEURL }}" class="nohover">{{ SITENAME }}</a></h2>
-      <p>{{ TAGLINE }}</p>
+      {{ TAGLINE }}
+      {% if SOCIAL|length > 1 %}
       <div class="social">
         {% for name, link in SOCIAL %}
-          {{ display_link(name, link, "") }}
+        {{ display_link(name, link, "") }}
         {% endfor %}
       </div>
+      {% endif %}
+      {% if LINKS|length > 1 %}
       <ul>
         {% for name, link in LINKS %}
         <li>{{ display_link(name, link, name) }}</li>
         {% endfor %}
       </ul>
+      {% endif %}
     </div>
   </aside>
 
@@ -138,7 +143,7 @@
       {% endfor %}
       {% endif %}
       {% if INDEX_SAVE_AS and INDEX_SAVE_AS != "index.html" %}
-      &#124; <a href="{{ SITEURL }}/{{ INDEX_SAVE_AS }}">Blog</a>
+      &#124; <a href="{{ SITEURL }}/{{ INDEX_LINK_AS }}">Blog</a>
       {% endif %}
       {% if FEED_ALL_ATOM %}
       &#124; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}">Atom Feed</a>
@@ -146,6 +151,9 @@
       {% if FEED_ALL_RSS %}
       &#124; <a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}">RSS Feed</a>
       {% endif %}
+      {% for title, link in MENUITEMS %}
+            &#124; <a href="{{ SITEURL }}/{{ link }}">{{ title }}</a>
+      {% endfor %}
       </p>
       {% endblock header %}
       {% block subheader %}{% include "modules/blogsubheader.html" %}{% endblock subheader %}
@@ -158,7 +166,7 @@
     {% endblock %}
 
     <div id="ending_message">
-        <p>&copy; {{ AUTHOR }}. Built using <a href="http://getpelican.com">Pelican</a>. Theme is <a href="https://github.com/pR0Ps/pelican-subtle">subtle</a> by <a href="http://cmetcalfe.ca">Carey Metcalfe</a>. Based on <a href="https://github.com/giulivo/pelican-svbhack">svbhack</a> by Giulio Fidente.</p>
+        <p>{{ SITENAME }}. Built using <a href="http://getpelican.com">Pelican</a>. Theme is <a href="https://github.com/pR0Ps/pelican-subtle">subtle</a> by <a href="http://cmetcalfe.ca">Carey Metcalfe</a>. Based on <a href="https://github.com/giulivo/pelican-svbhack">svbhack</a> by Giulio Fidente.</p>
     </div>
   </main>