diff --git a/assets/less/base/base.less b/assets/less/base/base.less
index ab7a15e6..0dd05d3e 100644
--- a/assets/less/base/base.less
+++ b/assets/less/base/base.less
@@ -1,3 +1,22 @@
+a {
+    color: inherit;
+    text-decoration: none;
+
+    &:focus,
+    &:hover {
+      text-decoration: underline;
+    }
+}
+
+main a {
+  text-decoration: underline;
+
+  &:focus,
+  &:hover {
+    text-decoration: none;
+  }
+}
+
 h1, h2, h3 {
     @apply .mb-2;
 }
diff --git a/source/_partials/nav-item.html.twig b/source/_partials/nav-item.html.twig
index 546226ae..772311ab 100644
--- a/source/_partials/nav-item.html.twig
+++ b/source/_partials/nav-item.html.twig
@@ -1,7 +1,4 @@
-<a
-    href="{{ href }}"
-    class="block text-grey-darkest no-underline p-4 border-l-2 md:border-l-0 md:border-b-2 border-transparent md:ml-4 md:mr-0 md:p-0 hover:border-grey-light {{ loop.first ? 'border-t border-grey-lighter md:border-t-0 md:border-transparent' }} {{ page.url matches '#' ~ pattern ~ '#' ? 'border-blue' }}"
->
+<a href="{{ href }}" class="p-4 border-l-2 md:border-l-0 md:border-b-2 md:ml-4 md:mr-0 md:p-0 hover:no-underline {{ page.url matches '#' ~ pattern ~ '#' ? 'border-blue' : 'border-transparent hover:border-grey-light' }} {{ loop.first ? 'border-t border-grey-lighter md:border-t-0 md:border-transparent' }}">
     <span class="flex items-center h-full">
         {{- title -}}
     </span>