11 files changed, 15 insertions, 24 deletions
diff --git a/theme/templates/404.html b/theme/templates/404.html
index e1f116e..d43d0ad 100644
--- a/theme/templates/404.html
+++ b/theme/templates/404.html
@@ -1,3 +1,3 @@
 {% extends "base.html"%}
-{% block title %}For oh four{% endblock %}
+{% block pagetitle %}For oh four{% endblock %}
 {% block content %}Whoopsie!{% endblock %}
diff --git a/theme/templates/500.html b/theme/templates/500.html
index 78786b7..db660a3 100644
--- a/theme/templates/500.html
+++ b/theme/templates/500.html
@@ -1,3 +1,3 @@
 {% extends "base.html"%}
-{% block title %}Server Error{% endblock %}
+{% block pagetitle %}Server Error{% endblock %}
 {% block content %}Sorry...{% endblock %}
diff --git a/theme/templates/archives.html b/theme/templates/archives.html
index 050f268..e50272b 100644
--- a/theme/templates/archives.html
+++ b/theme/templates/archives.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
+{% block pagetitle %}Archives for {{ SITENAME }}{% endblock %}
 {% block content %}
-<h1>Archives for {{ SITENAME }}</h1>
-
 <dl>
 {% for article in dates %}
     <dt>{{ article.locale_date }}</dt>
diff --git a/theme/templates/article.html b/theme/templates/article.html
index d558183..8afd2c0 100644
--- a/theme/templates/article.html
+++ b/theme/templates/article.html
@@ -4,23 +4,21 @@
   {% for keyword in article.keywords %}
     <meta name="keywords" content="{{keyword}}" />
   {% endfor %}
-
   {% for description in article.description %}
     <meta name="description" content="{{description}}" />
   {% endfor %}
-
   {% for tag in article.tags %}
     <meta name="tags" content="{{tag}}" />
   {% endfor %}
-
 {% endblock %}
 
+{% block pagetitle %}
+<a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
+    title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
+{% endblock %}
 {% block content %}
 <section id="content" class="body">
   <header>
-    <h2 class="entry-title">
-      <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
-         title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
  {% import 'translations.html' as translations with context %}
  {{ translations.translations_for(article) }}
   </header>
diff --git a/theme/templates/author.html b/theme/templates/author.html
index e9f7870..b679382 100644
--- a/theme/templates/author.html
+++ b/theme/templates/author.html
@@ -1,7 +1,5 @@
 {% extends "index.html" %}
 
 {% block title %}{{ SITENAME }} - Articles by {{ author }}{% endblock %}
-{% block content_title %}
-<h2>Articles by {{ author }}</h2>
-{% endblock %}
+{% block pagetitle %}Articles by {{ author }}{% endblock %}
 
diff --git a/theme/templates/authors.html b/theme/templates/authors.html
index 4914904..001e11e 100644
--- a/theme/templates/authors.html
+++ b/theme/templates/authors.html
@@ -1,10 +1,9 @@
 {% extends "base.html" %}
 
 {% block title %}{{ SITENAME }} - Authors{% endblock %}
+{% block pagetitle %}Authors on {{ SITENAME }}{% endblock %}
 
 {% block content %}
-    <h1>Authors on {{ SITENAME }}</h1>
-
     <ul>
     {%- for author, articles in authors|sort %}
         <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
diff --git a/theme/templates/base.html b/theme/templates/base.html
index 5c9fb0e..e69d326 100644
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -64,8 +64,8 @@
 <span class="path">
 {% block path %}{% endblock %}
 </span>
-<h1 class="content_title">{% block pagetitle %}Hey Hey Hey!{% endblock %}</h1>
-<h2 class="content_subtitle">{% block pagesubtitle %}{% endblock %}</h2>
+<h1 class="pagetitle">{% block pagetitle %}Hey Hey Hey!{% endblock %}</h1>
+<h2 class="pagesubtitle">{% block pagesubtitle %}{% endblock %}</h2>
 <div class="right_stuff">
 {% block right_stuff %}
 {% endblock %}
diff --git a/theme/templates/category.html b/theme/templates/category.html
index 4e6fd24..c5bfe9b 100644
--- a/theme/templates/category.html
+++ b/theme/templates/category.html
@@ -1,5 +1,3 @@
 {% extends "index.html" %}
-{% block content_title %}
-<h2>Articles in the {{ category }} category</h2>
-{% endblock %}
+{% block pagetitle %}Articles in the {{ category }} category{% endblock %}
 
diff --git a/theme/templates/page.html b/theme/templates/page.html
index 5ceb779..100cd04 100644
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{{ page.title }}{%endblock%}
+{% block pagetitle %}{{ page.title }}{% endblock %}
 {% block content %}
-    <h1>{{ page.title }}</h1>
     {% import 'translations.html' as translations with context %}
     {{ translations.translations_for(page) }}
 
diff --git a/theme/templates/period_archives.html b/theme/templates/period_archives.html
index d930dbb..9f7da56 100644
--- a/theme/templates/period_archives.html
+++ b/theme/templates/period_archives.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
+{% block pagetitle %}Archives for {{ period | reverse | join(' ') }}{% endblock %}
 {% block content %}
-<h1>Archives for {{ period | reverse | join(' ') }}</h1>
 
 <dl>
 {% for article in dates %}
diff --git a/theme/templates/tags.html b/theme/templates/tags.html
index b5d1482..1d49d42 100644
--- a/theme/templates/tags.html
+++ b/theme/templates/tags.html
@@ -1,9 +1,8 @@
 {% extends "base.html" %}
 
 {% block title %}{{ SITENAME }} - Tags{% endblock %}
-
+{% block pagetitle %}Tags for {{ SITENAME }}{% endblock %}
 {% block content %}
-    <h1>Tags for {{ SITENAME }}</h1>
     {%- for tag, articles in tags|sort %}
         <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
     {% endfor %}