diff --git a/layouts/partials/metadata.html b/layouts/partials/metadata.html
index 59ab5f2..c04fa35 100644
--- a/layouts/partials/metadata.html
+++ b/layouts/partials/metadata.html
@@ -64,15 +64,16 @@
       class="gblog-button__link"
       href="{{ .page.RelPermalink }}"
       title="All posts tagged with '{{ .name }}'"
-      >{{ .name }}</a
     >
+      {{ .name }}
+    </a>
   </span>
 {{ end }}
 
 {{ define "post-author" }}
   <span class="gblog-post__tag gblog-button">
-    <a class="gblog-button__link" href="{{ .page.RelPermalink }}" title="All posts of this author"
-      >{{ .name }}</a
-    >
+    <a class="gblog-button__link" href="{{ .page.RelPermalink }}" title="All posts of this author">
+      {{ .name }}
+    </a>
   </span>
 {{ end }}
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html
index 5dfa037..299343a 100644
--- a/layouts/partials/pagination.html
+++ b/layouts/partials/pagination.html
@@ -12,9 +12,9 @@
   <div class="gblog-paging__state">Page {{ $pag.PageNumber }} of {{ $pag.TotalPages }}</div>
   <div class="gblog-paging__item gblog-paging__item--next">
     {{ if $pag.HasNext }}
-      <a class="flex-inline align-center fake-link no-wrap" href="{{ $pag.Next.URL }}"
-        >NEXT<i class="gblog-icon">gblog_keyboard_arrow_right</i></a
-      >
+      <a class="flex-inline align-center fake-link no-wrap" href="{{ $pag.Next.URL }}">
+        NEXT<i class="gblog-icon">gblog_keyboard_arrow_right</i>
+      </a>
     {{ end }}
   </div>
 </nav>
diff --git a/layouts/partials/site-header.html b/layouts/partials/site-header.html
index 4d76179..008c01c 100644
--- a/layouts/partials/site-header.html
+++ b/layouts/partials/site-header.html
@@ -52,8 +52,9 @@
             <a
               class="gblog-nav__entry {{ if eq $currentPage .RelPermalink }}is-active{{ end }}"
               href="{{ .RelPermalink }}"
-              >{{ .Title }}</a
             >
+              {{ .Title }}
+            </a>
           </li>
         {{ end }}
       {{ end }}
diff --git a/layouts/shortcodes/button.html b/layouts/shortcodes/button.html
index de6add2..db200a4 100644
--- a/layouts/shortcodes/button.html
+++ b/layouts/shortcodes/button.html
@@ -14,7 +14,11 @@
 {{ end }}
 
 
-<span class="gblog-button gblog-button--{{ $size }}{{ with .Get "class" }}{{ . }}{{ end }}">
+<span
+  class="gblog-button gblog-button--{{ $size }}{{ with .Get "class" }}
+    {{ printf " %s" . }}
+  {{ end }}"
+>
   <a {{ with $ref }}href="{{ . }}"{{ end }} class="gblog-button__link">
     {{ $.Inner }}
   </a>
diff --git a/layouts/shortcodes/mermaid.html b/layouts/shortcodes/mermaid.html
index a811f32..8b43b6a 100644
--- a/layouts/shortcodes/mermaid.html
+++ b/layouts/shortcodes/mermaid.html
@@ -4,6 +4,6 @@
 {{ end }}
 
 
-<pre class="gblog-mermaid mermaid{{ with .Get "class" }}{{ . }}{{ end }}">
+<pre class="gblog-mermaid mermaid {{ with .Get "class" }}{{ . }}{{ end }}">
   {{- .Inner -}}
 </pre>