1 files changed, 8 insertions, 15 deletions
diff --git a/theme/templates/base.html b/theme/templates/base.html
index f895fe3..bcc5f98 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -5,30 +5,24 @@
 {% block head %}
 <title>{% block title %}{{ SITENAME }}{% endblock title %}</title>
 <meta charset="utf-8" />
-{% 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" />
+{% if FEED_RSS %}
+<link href="{{ FEED_DOMAIN }}//feeds/posts.atom.xml" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Posts RSS Feed" />
 {% endif %}
 {% if FEED_ATOM %}
-<link href="{{ FEED_DOMAIN }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+<link href="{{ FEED_DOMAIN }}//feeds/posts.rss.xml" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Posts Atom Feed" />
 {% endif %}
-{% if FEED_RSS %}
-<link href="{{ FEED_DOMAIN }}/{{ FEED_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+{% if CATEGORY_FEED_RSS and category %}
+<link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_RSS|format(category.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
 {% endif %}
 {% if CATEGORY_FEED_ATOM and category %}
 <link href="{{ FEED_DOMAIN }}/{{ CATEGORY_FEED_ATOM|format(category.slug) }}" 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.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Categories RSS Feed" />
+{% if TAG_FEED_RSS and tag %}
+<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
 {% endif %}
 {% if TAG_FEED_ATOM and tag %}
 <link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_ATOM|format(tag.slug) }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Tags Atom Feed" />
 {% endif %}
-{% if TAG_FEED_RSS and tag %}
-<link href="{{ FEED_DOMAIN }}/{{ TAG_FEED_RSS|format(tag.slug) }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} Tags RSS Feed" />
-{% endif %}
 {% block stylesheets %}
 <link rel="stylesheet" type="text/css" href="/static/style/reset.css" />
 <link rel="stylesheet" type="text/css" href="/static/style/default.css" />
@@ -64,7 +58,7 @@
 <span class="path">
 {% block path %}{% endblock %}
 </span>
-<h1 class="pagetitle">{% block pagetitle %}Hey Hey Hey!{% endblock %}</h1>
+<h1 class="pagetitle">{% block pagetitle %}{% endblock %}</h1>
 <h2 class="pagesubtitle">{% block pagesubtitle %}{% endblock %}</h2>
 <div class="right_stuff">
 {% block right_stuff %}
@@ -76,7 +70,6 @@
 <div class="content" id="main_content">
 &nbsp;
 {% block content %}
-Here lies content!
 {% endblock %}
 </div>
 {% block commentary %} {% endblock %}