diff --git a/lang.json b/lang.json
index 2f5560a6780171af530043bada516b6d15ee226a..5d9c78ce26d61eb2e910edbdd0c81f887696e498 100644
--- a/lang.json
+++ b/lang.json
@@ -8,6 +8,7 @@
 		"sitename": "<Dein Seitenname>",
 		"title_prefix": "",
 		"title_suffix": "",
+		"title_seperator": " | ",
 		"banner": {
 			"title": "Startseite <Dein Seitenname>",
 			"prefix": "",
diff --git a/theme/templates/index.html b/theme/templates/index.html
index 518759fc98301c1cf4d630d9ca8871e183a844c8..d2cef76f37bda24d711453493e6dc91fae648dea 100644
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -1,5 +1,7 @@
 {% extends "page.html" %}
 
+{% block title %}{{ t[l].title_prefix }}{{ t[l].sitename }}{{ t[l].title_suffix }}{% endblock %}
+
 {% block breadcrumb %}
 {% endblock breadcrumb %}
 
diff --git a/theme/templates/page.html b/theme/templates/page.html
index c579b01509b7362f82bc026adfa084bbe113badb..fdb41cbd4c785229b9cf201685aa017a02832594 100644
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}{{ render.softbreak_span(page.title)|striptags }}{% endblock %}
+{% block title %}{{ t[l].title_prefix }}{{ render.softbreak_span(page.title)|striptags }}{{ t[l].title_seperator }}{{ render.softbreak_span(page.category.title)|striptags }}{{ t[l].title_seperator }}{{ t[l].sitename }}{{ t[l].title_suffix }}{% endblock %}
 
 {% block extra_head %}
 {% endblock %}
diff --git a/theme/templates/tag.html b/theme/templates/tag.html
index c2e92599c9d56a87fcfb874e91262cdc643ff0f2..b1e7cb83af3ba1cff3f1775a813f5c30b5a20ef0 100644
--- a/theme/templates/tag.html
+++ b/theme/templates/tag.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
-{% block title -%}
-	{{ t[l].title_prefix }}{{ t[l].sitename }}{{ t[l].title_suffix }} - {{ render.softbreak_span(tag.title)|striptags }}
-{%- endblock -%}
+
+{% block title %}{{ t[l].title_prefix }}{{ render.softbreak_span(tag.title)|striptags }}{{ t[l].title_seperator }}{{ t[l].sitename }}{{ t[l].title_suffix }}{% endblock %}
 
 {% block breadcrumb %}
 	{{ nav.render_breadcrumb_menu(tag, l) }}