diff --git a/templates/blog.html.twig b/templates/blog.html.twig
index dae5a03..075f918 100644
--- a/templates/blog.html.twig
+++ b/templates/blog.html.twig
@@ -13,15 +13,18 @@
{% else %}
{% set show_pagination = true %}
{% endif %}
+{% set image = page.media[page.header.primaryImage] %}
+{% set title = page.title|raw %}
+{# Set page title by taxonomy #}
{% if uri.param('category') %}
- {% set page_title = theme_config.listing_title.taxonomy.category | default('Posts in Category: ') ~ uri.param('category') %}
+ {% set listing_title = 'FUTURE.BLOG.LISTING_TITLE_CATEGORY'|t ~ uri.param('category') %}
{% elseif uri.param('tag') %}
- {% set page_title = theme_config.listing_title.taxonomy.tag | default('Posts with Tag: ') ~ uri.param('tag') %}
+ {% set listing_title = 'FUTURE.BLOG.LISTING_TITLE_TAG'|t ~ uri.param('tag') %}
{% elseif uri.param('author') %}
- {% set page_title = theme_config.listing_title.taxonomy.author | default('Posts from Author: ') ~ uri.param('author') %}
+ {% set listing_title = 'FUTURE.BLOG.LISTING_TITLE_AUTHOR'|t ~ uri.param('author') %}
{% else %}
- {% set page_title = theme_config.listing_title.blog | default('') %}
+ {% set listing_title = page.header.subtitle|raw %}
{% endif %}
{% if base_url == '/' %}
@@ -37,14 +40,28 @@
{% endblock %}
{% block content %}
+
+ {{ listing_title|raw }}{{ title }}
+ {% if listing_title %}
+