diff --git a/templates/article.html b/templates/article.html
index 993970b..b3469a7 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -13,7 +13,7 @@
 	{%- if page.date -%}
 		<small>
 			<time datetime="{{ page.date | date(format=' %+') }}" pubdate>
-				{{ page.date | date(format=date_format, locale=date_locale) }}
+				{{- page.date | date(format=date_format, locale=date_locale) -}}
 			</time>
 			{%- if page.authors -%}
 				<span>•</span>
@@ -27,9 +27,7 @@
 					<ul class="tags inline">
 						{%- for item in taxon -%}
 							<li>
-								<a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">
-									{{ item }}
-								</a>
+								<a class="tag" href="{{ get_taxonomy_url(kind=name, name=item, lang=lang) }}">{{ item }}</a>
 							</li>
 						{%- endfor -%}
 					</ul>
@@ -39,8 +37,8 @@
 		{%- if page.updated -%}
 			<small class="last-updated">
 				<time datetime="{{ page.updated | date(format=' %+') }}" pubdate>
-					{{ macros_translate::translate(key="updated", default="Last updated on", language_strings=language_strings) }}
-					{{ page.updated | date(format=date_format, locale=date_locale) }}
+					{{- macros_translate::translate(key="updated", default="Last updated on", language_strings=language_strings) }}
+					{{ page.updated | date(format=date_format, locale=date_locale) -}}
 				</time>
 			</small>
 		{%- endif -%}
@@ -125,7 +123,7 @@
 	<a class="inline-button" href="#top">{{ macros_translate::translate(key="go_to_top", default="Go to Top", language_strings=language_strings) }}</a>
 	{%- if config.extra.issues_url -%}
 		<a class="inline-button colored external" href="{{ config.extra.issues_url }}">
-			{{ macros_translate::translate(key="file_an_issue", default="File an Issue", language_strings=language_strings) }}
+			{{- macros_translate::translate(key="file_an_issue", default="File an Issue", language_strings=language_strings) -}}
 		</a>
 	{%- endif -%}
 </div>
diff --git a/templates/article_list.html b/templates/article_list.html
index d168a3c..acae201 100644
--- a/templates/article_list.html
+++ b/templates/article_list.html
@@ -48,7 +48,7 @@
 			{%- if page.date %}
 				<small>
 					<time datetime="{{ page.date | date(format='%+') }}" pubdate>
-						{{ page.date | date(format=date_format, locale=date_locale) }}
+						{{- page.date | date(format=date_format, locale=date_locale) -}}
 					</time>
 					{%- if page.authors %}
 						<span>•</span>
diff --git a/templates/partials/footer.html b/templates/partials/footer.html
index 1ebd3c0..44997a9 100644
--- a/templates/partials/footer.html
+++ b/templates/partials/footer.html
@@ -6,13 +6,13 @@
 				{%- if link.url is matching('https?://') %}
 					<li>
 						<a href="{{ link.url }}">
-							{{ macros_translate::translate(key=link.name, default=link.name, language_strings=language_strings) }}
+							{{- macros_translate::translate(key=link.name, default=link.name, language_strings=language_strings) -}}
 						</a>
 					</li>
 				{%- else %}
 					<li>
 						<a href="{{ get_url(path=link.url, lang=lang)}}">
-							{{ macros_translate::translate(key=link.name, default=link.name, language_strings=language_strings) }}
+							{{- macros_translate::translate(key=link.name, default=link.name, language_strings=language_strings) -}}
 						</a>
 					</li>
 				{%- endif %}
@@ -32,7 +32,7 @@
 	{%- if config.extra.source_url and config.extra.footer.show_source %}
 		<p>
 			<a href="{{ config.extra.source_url }}">
-				{{ macros_translate::translate(key="source", default="Website source", language_strings=language_strings) }}
+				{{- macros_translate::translate(key="source", default="Website source", language_strings=language_strings) -}}
 			</a>
 		</p>
 	{%- endif %}
diff --git a/templates/partials/nav.html b/templates/partials/nav.html
index 2c31b5c..6a3179b 100644
--- a/templates/partials/nav.html
+++ b/templates/partials/nav.html
@@ -9,7 +9,7 @@
 					{%- if current_url | default(value="/") | trim_end_matches(pat="/") | safe == get_url(path="/", lang=lang) | trim_end_matches(pat='/') | safe -%}
 						class="active"
 					{%- endif -%}>
-					{{ config.title }}
+					{{- config.title -}}
 				</a>
 			</li>
 			{%- for link in config.extra.nav.links %}
@@ -19,7 +19,7 @@
 							{%- if current_url | default(value='/') | trim_end_matches(pat='/') | safe == link.url | trim_end_matches(pat='/') | safe -%}
 								class="active"
 							{%- endif -%}>
-							{{ macros_translate::translate(key=link.name, default=link.name, language_strings=language_strings) }}
+							{{- macros_translate::translate(key=link.name, default=link.name, language_strings=language_strings) -}}
 						</a>
 					</li>
 				{%- else %}
@@ -28,7 +28,7 @@
 							{%- if current_url | default(value='/') | trim_end_matches(pat='/') | safe == get_url(path=link.url, lang=lang) | trim_end_matches(pat='/') | safe -%}
 								class="active"
 							{%- endif -%}>
-							{{ macros_translate::translate(key=link.name, default=link.name, language_strings=language_strings) }}
+							{{- macros_translate::translate(key=link.name, default=link.name, language_strings=language_strings) -}}
 						</a>
 					</li>
 				{%- endif %}
@@ -38,7 +38,7 @@
 					<a onclick="toggleSearch()" onkeypress="toggleSearch()" tabindex="0">
 						<i class="icon"></i>
 						<span class="hidden">
-							{{ macros_translate::translate(key="search", default="Search", language_strings=language_strings) }}
+							{{- macros_translate::translate(key="search", default="Search", language_strings=language_strings) -}}
 						</span>
 					</a>
 				</li>
@@ -51,7 +51,7 @@
 					<a href="{{ get_url(path=config.feed_filenames[0]) }}">
 						<i class="icon"></i>
 						<span class="hidden">
-							{{ macros_translate::translate(key="feed", default="Feed", language_strings=language_strings) }}
+							{{- macros_translate::translate(key="feed", default="Feed", language_strings=language_strings) -}}
 						</span>
 					</a>
 				</li>
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index 12acddc..8bba7b3 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -45,7 +45,7 @@
 			{%- if page.date %}
 				<small>
 					<time datetime="{{ page.date | date(format='%+') }}" pubdate>
-						{{ page.date | date(format=date_format, locale=date_locale) }}
+						{{- page.date | date(format=date_format, locale=date_locale) -}}
 					</time>
 					{%- if page.authors %}
 						<span>•</span>