diff --git a/templates/archives.html b/templates/archives.html
index d3ff30e..b0c1d18 100644
--- a/templates/archives.html
+++ b/templates/archives.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+
 {% block title %} &ndash; {{ _('Archives') }}{% endblock %}
 
 {% block content %}
@@ -9,12 +10,16 @@
   <div>
     <dl>
       {% set previous_date = False %}
+
       {% for article in dates %}
         {% if article.locale_date != previous_date %}
           {% set previous_date = article.locale_date %}
-      <dt>{{ article.locale_date }}</dt>
+          <dt>{{ article.locale_date }}</dt>
         {% endif %}
-      <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+
+        <dd>
+          <a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a>
+        </dd>
       {% endfor %}
     </dl>
   </div>
diff --git a/templates/article.html b/templates/article.html
index 26fa99b..2f12053 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -31,7 +31,7 @@
            category='<a href="%s/%s">%s</a>'|format(SITEURL, article.category.url, article.category)|safe) }}
 
       {% if 'post_stats' in PLUGINS %}
-        &#8226; {{ article.stats['read_mins'] }} min read
+        &#8226; {{ _('%(minutes) min read', minutes=article.stats['read_mins']) }}
       {% endif %}
     </p>
   </header>
diff --git a/templates/base.html b/templates/base.html
index bc6b122..6971ed2 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -136,11 +136,7 @@
     {% include "partial/gtm.html" %}
   {% endif %}
 </head>
-<body
-  {% if not THEME_COLOR_AUTO_DETECT_BROWSER_PREFERENCE %}
-    class="{{ THEME_COLOR|default('light') }}-theme"
-  {% endif %}
->
+<body {% if not THEME_COLOR_AUTO_DETECT_BROWSER_PREFERENCE %}class="{{ THEME_COLOR|default('light') }}-theme"{% endif %}>
   {% if GOOGLE_TAG_MANAGER %}
     {% include "partial/gtm_noscript.html" %}
   {% endif %}
@@ -153,22 +149,25 @@
         <img src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/profile.png" alt="{{ SITETITLE }}" title="{{ SITETITLE }}">
         {% endif %}
       </a>
-      <h1><a href="{{ SITEURL }}">{{ SITETITLE }}</a></h1>
+
+      <h1>
+        <a href="{{ SITEURL }}">{{ SITETITLE }}</a>
+      </h1>
 
       {% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}
+
       {% if 'tipue_search' in PLUGINS %}
         <form class="navbar-search" action="/search.html" role="search">
-            <input type="text" name="q" id="tipue_search_input" placeholder="Search..">
+          <input type="text" name="q" id="tipue_search_input" placeholder="{{ _('Search...') }}">
         </form>
       {% endif %}
+
       {% if pages or LINKS %}
       <nav>
         <ul class="list">
           {# Open links in new window depending on the LINKS_IN_NEW_TAB setting #}
           {% macro get_target(link) -%}
-            {%- if LINKS_IN_NEW_TAB is not defined -%}
-            _blank
-            {%- elif LINKS_IN_NEW_TAB in ('all', none, true) -%}
+            {%- if LINKS_IN_NEW_TAB in ('all', true) -%}
             _blank
             {%- elif LINKS_IN_NEW_TAB == "external" and not link.startswith("/") and not link.startswith(SITEURL) -%}
             _blank
@@ -180,14 +179,22 @@
           {% if PAGES_SORT_ATTRIBUTE -%}
             {% set pages = pages|sort(attribute=PAGES_SORT_ATTRIBUTE) %}
           {%- endif %}
+
           {% if DISPLAY_PAGES_ON_MENU %}
-          {% for page in pages %}
-            <li><a target="{{ get_target(SITEURL) }}" href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_URL_HASH %}#{{ page.slug }}{% endif %}">{{ page.title }}</a></li>
-          {% endfor %}
+            {% for page in pages %}
+              <li>
+                <a target="{{ get_target(SITEURL) }}"
+                   href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_URL_HASH %}#{{ page.slug }}{% endif %}">
+                  {{ page.title }}
+                </a>
+              </li>
+            {% endfor %}
           {% endif %}
 
           {% for name, link in LINKS %}
-            <li><a target="{{ get_target(link) }}" href="{{ link }}" >{{ name }}</a></li>
+            <li>
+              <a target="{{ get_target(link) }}" href="{{ link }}" >{{ name }}</a>
+            </li>
           {% endfor %}
         </ul>
       </nav>
@@ -197,9 +204,9 @@
         {% for name, link in SOCIAL %}
           <li>
             <a {% if name == 'mastodon' %}rel="me"{% endif %} class="sc-{{ name }}" href="{{ link }}" target="_blank">
-            <i class="{% if name in ['envelope', 'rss'] %}fas{% else %}fab{% endif %} fa-{{ name }}">
-            </i>
-          </a></li>
+              <i class="{% if name in ['envelope', 'rss'] %}fas{% else %}fab{% endif %} fa-{{ name }}"></i>
+            </a>
+          </li>
         {% endfor %}
       </ul>
     </div>
@@ -213,7 +220,6 @@
         (adsbygoogle = window.adsbygoogle || []).push({});
       </script>
     {% endif %}
-
   </aside>
   <main>
     {% if GOOGLE_ADSENSE and GOOGLE_ADSENSE.ads.main_menu %}
@@ -270,18 +276,18 @@
 
   {% include "partial/jsonld.html" %}
 
-  {% block additional_js %}{% endblock %}
-
   {% if GITHUB_CORNER_URL %}
-  {% include 'partial/github.html' %}
+    {% include 'partial/github.html' %}
   {% endif %}
 
   {% if 'tipue_search' in PLUGINS %}
     <script>
       $(document).ready(function() {
-          $('#tipue_search_input').tipuesearch();
+        $('#tipue_search_input').tipuesearch();
       });
     </script>
   {% endif %}
+
+  {% block additional_js %}{% endblock %}
 </body>
 </html>
diff --git a/templates/categories.html b/templates/categories.html
index a963c24..eeaa841 100644
--- a/templates/categories.html
+++ b/templates/categories.html
@@ -10,7 +10,9 @@
   <div>
     <ul class="list">
       {% for category, articles in categories|sort %}
-      <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
+      <li>
+        <a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})
+      </li>
       {% endfor %}
     </ul>
   </div>
diff --git a/templates/index.html b/templates/index.html
index 008ddc3..6a7ee71 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -29,7 +29,7 @@
       {% endif %}
 
       {% if 'post_stats' in PLUGINS %}
-        &#8226; {{ article.stats['read_mins'] }} min read
+        &#8226; {{ _('%(minutes) min read', minutes=article.stats['read_mins']) }}
       {% endif %}
     </p>
   </header>
@@ -41,7 +41,10 @@
       {{ article.summary }}
       {% if article.content != article.summary %}
         <br>
-        <a class="btn" href="{{ SITEURL }}/{{ article.url }}{% if not DISABLE_URL_HASH %}#{{ article.slug }}{% endif %}">{{ _('Continue reading') }}</a>
+        <a class="btn"
+           href="{{ SITEURL }}/{{ article.url }}{% if not DISABLE_URL_HASH %}#{{ article.slug }}{% endif %}">
+          {{ _('Continue reading') }}
+        </a>
       {% endif %}
     {% else %}
       {{ article.content }}
@@ -65,5 +68,4 @@
   </script>
 {% endif %}
 
-
 {% endblock %}
diff --git a/templates/period_archives.html b/templates/period_archives.html
index d3ff30e..24f494e 100644
--- a/templates/period_archives.html
+++ b/templates/period_archives.html
@@ -9,12 +9,14 @@
   <div>
     <dl>
       {% set previous_date = False %}
+
       {% for article in dates %}
         {% if article.locale_date != previous_date %}
           {% set previous_date = article.locale_date %}
-      <dt>{{ article.locale_date }}</dt>
+           <dt>{{ article.locale_date }}</dt>
         {% endif %}
-      <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+
+        <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
       {% endfor %}
     </dl>
   </div>
diff --git a/templates/search.html b/templates/search.html
index 9311c14..df8c004 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -1,4 +1,7 @@
-{% if 'tipue_search' in PLUGINS %} {% extends 'base.html' %} {% block title %} {{ _('Search') }} - {{ SITENAME|striptags }} {% endblock title %} {% block content %}
+{% if 'tipue_search' in PLUGINS %}
+{% extends 'base.html' %}
+{% block title %}{{ _('Search') }} - {{ SITENAME|striptags }}{% endblock title %}
+{% block content %}
 <script>
     $(document).ready(function() {
         $('#tipue_search_input').tipuesearch({
@@ -15,5 +18,5 @@
     </header>
     <div id="tipue_search_content"></div>
 </article>
-
-{% endblock content %} {% endif %}
+{% endblock content %}
+{% endif %}
