diff --git a/src/firefighter/incidents/templates/layouts/partials/footer.html b/src/firefighter/incidents/templates/layouts/partials/footer.html
index 302cfe7f..934e6f80 100644
--- a/src/firefighter/incidents/templates/layouts/partials/footer.html
+++ b/src/firefighter/incidents/templates/layouts/partials/footer.html
@@ -7,7 +7,6 @@
   <h2 id="footer-heading" class="sr-only">Footer</h2>
   <div class="mx-auto max-w-7xl py-12 px-4 sm:px-6 lg:py-16 lg:px-8">
     <div class="md:grid md:grid-cols-3 md:gap-8">
-
       <div class="mt-8 md:mt-0">
         <h3 class="footer-title">{{APP_DISPLAY_NAME}}{% if FF_VERSION %} <span class="text-base-content text-opacity-80 text-sm font-normal"> {{ FF_VERSION }} </span>{% endif %}</h3>
         <p class="mt-2 text-sm text-base-content text-opacity-70">Report, manage, escalate!</p>
diff --git a/src/firefighter/incidents/templates/layouts/partials/header.html b/src/firefighter/incidents/templates/layouts/partials/header.html
index de198869..d1433c75 100644
--- a/src/firefighter/incidents/templates/layouts/partials/header.html
+++ b/src/firefighter/incidents/templates/layouts/partials/header.html
@@ -18,7 +18,7 @@
                     {{item.title}}
                   </a>
                 </summary>
-                <ul class="p-2 bg-base-200 rounded-md z-[15]">
+                <ul class="p-2 rounded-md z-[15]">
                   {% for child in item.children%}
                     <li><a {% if item.boost %}hx-boost="true"{% else %}hx-boost="false"{% endif %} href="{{child.url}}" class="{% if child.selected %}active{% endif %}">{{child.title}}{% if item.badge %}<span class="badge">{{child.badge}}</span>
                     {% endif %}</a></li>
@@ -48,11 +48,11 @@
                 {{item.title}}
               </a>
             </div>
-            <ul  tabindex="0" class="dropdown-content p-2 bg-base-200 rounded-md z-[15] menu  ml-0 p-2 shadow bg-base-100 rounded-box w-52">
+            <ul tabindex="0" class="dropdown-content p-2 rounded-md z-[15] menu  ml-0 p-2 shadow bg-neutral-800 rounded-box w-52">
               {% for child in item.children %}
                 <li class="py-1">
                   <a {% if item.boost %}hx-boost="true"{% else %}hx-boost="false"{% endif %} href="{{ child.url }}"
-                     class="whitespace-nowrap  {% if child.selected %}active {% endif %}">
+                     class="whitespace-nowrap  rounded-md {% if child.selected %}active{% endif %}">
                     {{ child.title }}
                   </a>
                 </li>