diff --git a/templates/about.html b/templates/about.html
index 845559d..a8cbeae 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -1,5 +1,7 @@
{% extends "index.html" %}
+{% block page_title %}About{% endblock %}
+
{% block menu_about_class %}selected{% endblock %}
{% block content %}
diff --git a/templates/explore.html b/templates/explore.html
index 03ea698..62935a7 100644
--- a/templates/explore.html
+++ b/templates/explore.html
@@ -1,5 +1,7 @@
{% extends "index.html" %}
+{% block page_title %}Explore{% endblock %}
+
{% block menu_explore_class %}selected{% endblock %}
{% block content %}
diff --git a/templates/layout.html b/templates/layout.html
index 93aaf83..be4f0d7 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -7,7 +7,7 @@
-
{{ title if title }}
+ {% block page_title %}{% endblock %}
diff --git a/templates/mailing_list/emails.html b/templates/mailing_list/emails.html
index 4d957db..84cc3d9 100644
--- a/templates/mailing_list/emails.html
+++ b/templates/mailing_list/emails.html
@@ -1,5 +1,7 @@
{% extends "mailing_list/mailing_list.html" %}
+{% block page_title %}Mailing list: {{ list_address }}{% endblock %}
+
{% block content %}
diff --git a/templates/mailing_list/emails_thread.html b/templates/mailing_list/emails_thread.html
index babeb7d..c97729d 100644
--- a/templates/mailing_list/emails_thread.html
+++ b/templates/mailing_list/emails_thread.html
@@ -1,5 +1,7 @@
{% extends "mailing_list/mailing_list.html" %}
+{% block page_title %}{{ thread.title }} - {{ list_address }}{% endblock %}
+
{% block content %}
diff --git a/templates/repository/blob.html b/templates/repository/blob.html
index 9bf4cc7..fd47d13 100644
--- a/templates/repository/blob.html
+++ b/templates/repository/blob.html
@@ -1,5 +1,7 @@
{% extends "repository/repository.html" %}
+{% block page_title %}Tree: {{ repository }}/{{ revision }}{{ '/' + tree_path if tree_path }}{% endblock %}
+
{% block menu_tree_class %}selected{% endblock %}
{% block content %}
diff --git a/templates/repository/log.html b/templates/repository/log.html
index aa84bf8..d65c579 100644
--- a/templates/repository/log.html
+++ b/templates/repository/log.html
@@ -1,5 +1,7 @@
{% extends "repository/repository.html" %}
+{% block page_title %}Log: {{ repository }}/{{ revision }}{% endblock %}
+
{% block menu_log_class %}selected{% endblock %}
{% block content %}
diff --git a/templates/repository/overview.html b/templates/repository/overview.html
index 04a00de..eafdc47 100644
--- a/templates/repository/overview.html
+++ b/templates/repository/overview.html
@@ -1,5 +1,7 @@
{% extends "repository/repository.html" %}
+{% block page_title %}Overview: {{ repository }}{% endblock %}
+
{% block menu_overview_class %}selected{% endblock %}
{% block content %}
diff --git a/templates/repository/refs.html b/templates/repository/refs.html
index 0344ec6..cd8b50a 100644
--- a/templates/repository/refs.html
+++ b/templates/repository/refs.html
@@ -1,5 +1,7 @@
{% extends "repository/repository.html" %}
+{% block page_title %}Refs: {{ repository }}{% endblock %}
+
{% block menu_refs_class %}selected{% endblock %}
{% block content %}
diff --git a/templates/repository/tree.html b/templates/repository/tree.html
index 8a9063d..3e1b2cf 100644
--- a/templates/repository/tree.html
+++ b/templates/repository/tree.html
@@ -1,5 +1,7 @@
{% extends "repository/repository.html" %}
+{% block page_title %}Tree: {{ repository }}/{{ revision }}{{ '/' + tree_path if tree_path }}{% endblock %}
+
{% block menu_tree_class %}selected{% endblock %}
{% block content %}