diff --git a/balkiantheme/templates/article.html b/balkiantheme/templates/article.html
index f369c51..785b4a3 100644
--- a/balkiantheme/templates/article.html
+++ b/balkiantheme/templates/article.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% block content_title %}
+{% block site_title %}
{{ article.title }}
{% endblock %}
{% block content %}
diff --git a/balkiantheme/templates/base.html b/balkiantheme/templates/base.html
index f390de6..7610ce8 100644
--- a/balkiantheme/templates/base.html
+++ b/balkiantheme/templates/base.html
@@ -3,7 +3,7 @@
- {{ SITENAME }}
+ {{ SITENAME }} - {% block site_title %}WELCOME{% endblock %}
diff --git a/balkiantheme/templates/category.html b/balkiantheme/templates/category.html
new file mode 100644
index 0000000..4049602
--- /dev/null
+++ b/balkiantheme/templates/category.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block site_title %}{{ category }}{% endblock %}
diff --git a/balkiantheme/templates/page.html b/balkiantheme/templates/page.html
index 78ae09f..ee31105 100644
--- a/balkiantheme/templates/page.html
+++ b/balkiantheme/templates/page.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% block content_title %}
+{% block site_title %}
{{ page.title }}
{% endblock %}
{% block content %}
diff --git a/balkiantheme/templates/tag.html b/balkiantheme/templates/tag.html
index ebba2a8..855326b 100644
--- a/balkiantheme/templates/tag.html
+++ b/balkiantheme/templates/tag.html
@@ -1,5 +1,5 @@
{% extends "index.html" %}
-{% block content_title %}{{ SITENAME }} - {{ tag }}{% endblock %}
+{% block site_title %}{{ tag }}{% endblock %}
{% block pre_articles %}
Entries tagged: {{ tag }}
{% endblock %}
diff --git a/balkiantheme/templates/tags.html b/balkiantheme/templates/tags.html
index 5ccea5b..4ef411a 100644
--- a/balkiantheme/templates/tags.html
+++ b/balkiantheme/templates/tags.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% block content_title %}
+{% block site_title %}
{{ page_name }}
{% endblock %}
{% block content %}