diff --git a/app/assets/styles.css b/app/assets/styles.css
index eb242c3..0d842d1 100644
--- a/app/assets/styles.css
+++ b/app/assets/styles.css
@@ -65,6 +65,10 @@
   p {
     @apply mb-4;
   }
+
+  a {
+    @apply text-primary underline;
+  }
 }
 
 body {
diff --git a/app/components/mobile-bar.hbs b/app/components/mobile-bar.hbs
index d0b85c1..4f4c16a 100644
--- a/app/components/mobile-bar.hbs
+++ b/app/components/mobile-bar.hbs
@@ -8,13 +8,7 @@
     <Icons::Menu @title='Menu' />
   </button>
 
-  <LinkTo @route="index" class='text-2xl font-display flex-1 flex items-center justify-center'>
+  <LinkTo @route="index" class='text-inherit no-underline text-2xl font-display flex-1 flex items-center justify-center'>
     MeiliAdmin
   </LinkTo>
 </div>
-{{!-- <a
-  href='/'
-  title='{{@siteName}}'
-  class='text-2xl font-display flex-1 flex items-center justify-center lg:mt-6'
-  {{on 'click' this.closeSidebar}}
->{{@siteName}}</a> --}}
diff --git a/app/components/pagination.hbs b/app/components/pagination.hbs
index ea270a2..ce35356 100644
--- a/app/components/pagination.hbs
+++ b/app/components/pagination.hbs
@@ -5,7 +5,7 @@
     ...attributes
   >
     {{#let
-      'inline-flex items-center justify-center px-2 mx-1 font-display text-lg'
+      'inline-flex items-center justify-center px-2 mx-1 font-display text-lg text-inherit no-underline'
       as |commonClasses|
     }}
       {{#if this.previousPage}}
diff --git a/app/components/tab.hbs b/app/components/tab.hbs
index 175d6fb..615c926 100644
--- a/app/components/tab.hbs
+++ b/app/components/tab.hbs
@@ -2,7 +2,7 @@
   @route={{@route}}
   @models={{if @model (array @model) @models}}
   @activeClass="text-primary border-b border-primary"
-  class="flex items-center h-10 px-4 py-2 text-center bg-transparent whitespace-nowrap focus:outline-none"
+  class="flex items-center h-10 px-4 py-2 text-center text-base-2 no-underline bg-transparent whitespace-nowrap focus:outline-none"
 >
   {{#if @icon}}
     <@icon class="mr-2" />
diff --git a/app/templates/admin.hbs b/app/templates/admin.hbs
index 2e77526..c20f176 100644
--- a/app/templates/admin.hbs
+++ b/app/templates/admin.hbs
@@ -4,7 +4,7 @@
   <aside class='sidenav'>
     <SidenavBackground />
     {{#let
-      'flex items-center px-4 py-2 font-semibold rounded text-lg text-base-2 hover:text-base-1 hover:bg-base-6'
+      'flex items-center px-4 py-2 font-semibold rounded text-lg text-base-2 no-underline hover:text-base-1 hover:bg-base-6'
       as |classLink|
     }}
       <div class='sidenav-sections'>
@@ -53,15 +53,11 @@
 
           <div class='mb-4 p-4 bg-base-6 rounded'>
             This application is currently in active development. If you have an
-            issue, please use GitHub
-            <a
+            issue, please use GitHub <a
               href='https://github.com/kaermorchen/meiliadmin/issues'
               target='_blank'
               rel='noopener noreferrer'
-            >
-              issues
-            </a>
-            to notify me.
+            >issues</a> to notify me.
           </div>
 
           <ThemeToggler class='mb-6 mt-5' />
diff --git a/app/templates/admin/indexes/item/documents/index.hbs b/app/templates/admin/indexes/item/documents/index.hbs
index 2b8868e..44e4ea2 100644
--- a/app/templates/admin/indexes/item/documents/index.hbs
+++ b/app/templates/admin/indexes/item/documents/index.hbs
@@ -83,7 +83,7 @@
     <Column class='relative'>
       {{#let
         (array @model.index.uid (get data @model.index.primaryKey))
-        'flex items-center px-4 py-2 text-sm hover:bg-base-6 hover:text-base-1'
+        'flex items-center px-4 py-2 text-inherit no-underline text-sm hover:bg-base-6 hover:text-base-1'
         as |models linkClasses|
       }}
         <Menu as |menu|>