diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c1c07db..73393785 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Minor style issue with `button` shortcode
 - Hugo Modules would fail when using default theme config file
 - Some content not centred correctly on the profile homepage layout
+- Some links missing the correct styles when in Firefox
 
 ## [1.1.1] - 2020-08-19
 
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index e9c88b94..2c58163b 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -5,7 +5,7 @@
       <article class="w-full px-2 my-3 overflow-hidden sm:w-1/2 md:w-1/3 lg:w-1/4 xl:w-1/5">
         <h2>
           <a
-            class="text-xl font-medium hover:underline underline-primary-500"
+            class="text-xl font-medium hover:underline hover:underline-primary-500 hover:underline-offset-small"
             href="{{ .Page.Permalink }}"
             >{{ .Page.Title }}</a
           >
diff --git a/layouts/partials/article-link.html b/layouts/partials/article-link.html
index 200d9fbf..efd3b2c6 100644
--- a/layouts/partials/article-link.html
+++ b/layouts/partials/article-link.html
@@ -11,7 +11,11 @@
         >&#8599;</span
       >
     {{ else }}
-      <a class="hover:underline underline-primary-500" href="{{ .Permalink }}">{{ .Title }}</a>
+      <a
+        class="hover:underline hover:underline-primary-500 hover:underline-offset-small"
+        href="{{ .Permalink }}"
+        >{{ .Title }}</a
+      >
     {{ end }}
     {{ if and .Draft .Site.Params.article.showDraftLabel }}
       {{ partial "badge.html" "Draft" }}
diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html
index 520a8c91..a943add8 100644
--- a/layouts/partials/breadcrumbs.html
+++ b/layouts/partials/breadcrumbs.html
@@ -8,7 +8,9 @@
     {{ template "crumb" (dict "p1" .p1.Site.Home "p2" .p2 ) }}
   {{ end }}
   <li class="inline {{ if or (eq .p1 .p2) (.p1.IsHome) }}hidden{{ end }}">
-    <a class="hover:underline underline-gray-300 dark:underline-gray-600" href="{{ .p1.Permalink }}"
+    <a
+      class="hover:underline hover:underline-gray-300 dark:underline-gray-600"
+      href="{{ .p1.Permalink }}"
       >{{ .p1.Title }}</a
     ><span class="px-1 text-primary-500">/</span>
   </li>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 1da851e6..52938ae9 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -14,14 +14,14 @@
     <p class="text-xs text-gray-300 dark:text-gray-600">
       {{ i18n "footer.powered_by" }}
       <a
-        class="hover:underline underline-primary-300 hover:text-primary-400"
+        class="hover:underline hover:underline-primary-300 hover:text-primary-400"
         href="https://gohugo.io/"
         target="_blank"
         >Hugo</a
       >
       &amp;
       <a
-        class="hover:underline underline-primary-300 hover:text-primary-400"
+        class="hover:underline hover:underline-primary-300 hover:text-primary-400"
         href="https://git.io/hugo-congo"
         target="_blank"
         >Congo</a
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 6199ad07..713c30ce 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,7 +1,7 @@
 <header class="flex justify-between py-6 font-semibold sm:py-10">
   <div>
     <a
-      class="hover:underline underline-primary-500 underline-thickness-bold underline-offset-small"
+      class="hover:underline hover:underline-primary-500 hover:underline-thickness-bold hover:underline-offset-small"
       rel="me"
       href="{{ .Site.BaseURL }}"
       >{{ .Site.Title }}</a
@@ -12,7 +12,7 @@
       {{ range .Site.Menus.main }}
         <li class="text-right sm:mr-7 sm:last:mr-0">
           <a
-            class="hover:underline underline-primary-500 underline-thickness-bold underline-offset-small"
+            class="hover:underline hover:underline-primary-500 hover:underline-thickness-bold hover:underline-offset-small"
             href="{{ .URL | absURL }}"
             title="{{ .Title }}"
             >{{ .Name }}</a