diff --git a/layout/archive.swig b/layout/archive.swig
index bbc81b43d..d07c68b7f 100644
--- a/layout/archive.swig
+++ b/layout/archive.swig
@@ -2,7 +2,7 @@
 {% import '_macro/post-collapse.swig' as post_template %}
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
-{% block title %} {{ __('title.archive') }} | {{ config.title }} {% endblock %}
+{% block title %}{{ __('title.archive') }} | {{ config.title }}{% endblock %}
 
 {% block page_class %} page-archive {% endblock %}
 
diff --git a/layout/category.swig b/layout/category.swig
index b94535531..380ac02fd 100644
--- a/layout/category.swig
+++ b/layout/category.swig
@@ -2,7 +2,7 @@
 {% import '_macro/post-collapse.swig' as post_template %}
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
-{% block title %} {{ __('title.category') }}: {{ page.category }} | {{ config.title }} {% endblock %}
+{% block title %}{{ __('title.category') }}: {{ page.category }} | {{ config.title }}{% endblock %}
 
 {% block content %}
 
diff --git a/layout/page.swig b/layout/page.swig
index 8af0456de..bdaa45775 100644
--- a/layout/page.swig
+++ b/layout/page.swig
@@ -1,17 +1,7 @@
 {% extends '_layout.swig' %}
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
-{% block title %}
-  {% set page_title_suffix = ' | ' + config.title %}
-
-  {% if page.type === "categories" and not page.title  %}
-    {{ __('title.category') + page_title_suffix }}
-  {% elif page.type === "tags" and not page.title  %}
-    {{ __('title.tag') + page_title_suffix }}
-  {% else %}
-    {{ page.title + page_title_suffix }}
-  {% endif %}
-{% endblock %}
+{% block title %}{% set page_title_suffix = ' | ' + config.title %}{% if page.type === "categories" and not page.title %}{{ __('title.category') + page_title_suffix }}{% elif page.type === "tags" and not page.title %}{{ __('title.tag') + page_title_suffix }}{% else %}{{ page.title + page_title_suffix }}{% endif %}{% endblock %}
 
 {% block content %}
 
diff --git a/layout/post.swig b/layout/post.swig
index 9f12a6295..091f3264f 100644
--- a/layout/post.swig
+++ b/layout/post.swig
@@ -3,7 +3,7 @@
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
 
-{% block title %} {{ page.title }} | {{ config.title }} {% endblock %}
+{% block title %}{{ page.title }} | {{ config.title }}{% endblock %}
 
 {% block page_class %}page-post-detail{% endblock %}
 
diff --git a/layout/schedule.swig b/layout/schedule.swig
index e59587735..7136a212f 100644
--- a/layout/schedule.swig
+++ b/layout/schedule.swig
@@ -1,7 +1,7 @@
 {% extends '_layout.swig' %}
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
-{% block title %} {{ __('title.schedule') }} | {{ config.title }} {% endblock %}
+{% block title %}{{ __('title.schedule') }} | {{ config.title }}{% endblock %}
 
 {% block page_class %}page-post-detail page-calendar{% endblock %}
 
diff --git a/layout/tag.swig b/layout/tag.swig
index b2da253c7..56a22e4ef 100644
--- a/layout/tag.swig
+++ b/layout/tag.swig
@@ -2,7 +2,7 @@
 {% import '_macro/post-collapse.swig' as post_template %}
 {% import '_macro/sidebar.swig' as sidebar_template %}
 
-{% block title %} {{ __('title.tag') }}: {{ page.tag }} | {{ config.title }} {% endblock %}
+{% block title %}{{ __('title.tag') }}: {{ page.tag }} | {{ config.title }}{% endblock %}
 
 {% block content %}