diff --git a/_includes/footer.html b/_includes/footer.html
index 6665973..50e4abb 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,40 +1,36 @@
-    <footer class="header navbar">
-      <div class="container d-flex">
-        <ul class="nav">
-          <li class="nav-item"><a href="https://git.libregaming.org/onFOSS/onFOSS.org" target="_blank" class="nav-link">Source-Code</a></li>
-          <li class="nav-item"><a href="/privacy.html" class="nav-link">Privacy Notice</a></li>
-          <li class="nav-item"><a href="/imprint.html" class="nav-link">Imprint</a></li>
-          <li class="nav-item"><a href="/schedule.html" class="nav-link">History</a></li>
-          <li class="nav-item"><a href="/finances.html" class="nav-link">Finances</a></li>
-        </ul>
+    <footer class="d-flex flex-wrap justify-content-between align-items-center px-5 py-2 bg-body-tertiary">
+      <ul class="nav justify-content-start list-unstyled d-flex">
+        <li class="nav-item"><a href="https://git.libregaming.org/onFOSS/onFOSS.org" target="_blank" class="nav-link">Source-Code</a></li>
+        <li class="nav-item"><a href="/privacy.html" class="nav-link">Privacy Notice</a></li>
+        <li class="nav-item"><a href="/imprint.html" class="nav-link">Imprint</a></li>
+        <li class="nav-item"><a href="/schedule.html" class="nav-link">History</a></li>
+        <li class="nav-item"><a href="/finances.html" class="nav-link">Finances</a></li>
+      </ul>
+      <div class="d-flex btn-group">
+        <a href="https://fosstodon.org/@onfoss" target="_blank" class="btn btn-primary" role="button">
+          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-mastodon" viewBox="0 0 16 16">
+            <path d="M11.19 12.195c2.016-.24 3.77-1.475 3.99-2.603.348-1.778.32-4.339.32-4.339 0-3.47-2.286-4.488-2.286-4.488C12.062.238 10.083.017 8.027 0h-.05C5.92.017 3.942.238 2.79.765c0 0-2.285 1.017-2.285 4.488l-.002.662c-.004.64-.007 1.35.011 2.091.083 3.394.626 6.74 3.78 7.57 1.454.383 2.703.463 3.709.408 1.823-.1 2.847-.647 2.847-.647l-.06-1.317s-1.303.41-2.767.36c-1.45-.05-2.98-.156-3.215-1.928a3.614 3.614 0 0 1-.033-.496s1.424.346 3.228.428c1.103.05 2.137-.064 3.188-.189zm1.613-2.47H11.13v-4.08c0-.859-.364-1.295-1.091-1.295-.804 0-1.207.517-1.207 1.541v2.233H7.168V5.89c0-1.024-.403-1.541-1.207-1.541-.727 0-1.091.436-1.091 1.296v4.079H3.197V5.522c0-.859.22-1.541.66-2.046.456-.505 1.052-.764 1.793-.764.856 0 1.504.328 1.933.983L8 4.39l.417-.695c.429-.655 1.077-.983 1.934-.983.74 0 1.336.259 1.791.764.442.505.661 1.187.661 2.046v4.203z"/>
+          </svg>
+          <span class="visually-hidden">Mastodon</span>
+        </a>
+        <a href="https://peertube.linuxrocks.online/@onfoss" target="_blank" class="btn btn-primary" role="button">
+          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" class="bi" viewBox="0 0 24 24">
+            <path fill="currentColor" d="M12 6.545v10.91L20.727 12M3.273 12v12L12 17.455M3.273 0v12L12 6.545"/>
+          </svg>
+          <span class="visually-hidden">PeerTube</span>
+        </a>
+        <a href="https://onfoss.org/feed.xml" target="_blank" class="btn btn-primary" role="button">
+        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-rss" viewBox="0 0 16 16">
+          <path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
+          <path d="M5.5 12a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm-3-8.5a1 1 0 0 1 1-1c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1-1-1zm0 4a1 1 0 0 1 1-1 6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1-1-1z"/>
+        </svg>
+          <span class="visually-hidden">RSS</span>
+        </a>
+        <a href="https://git.libregaming.org/onFOSS" target="_blank" class="btn btn-primary" role="button">
+        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-git" viewBox="0 0 16 16">
+          <path d="M15.698 7.287 8.712.302a1.03 1.03 0 0 0-1.457 0l-1.45 1.45 1.84 1.84a1.223 1.223 0 0 1 1.55 1.56l1.773 1.774a1.224 1.224 0 0 1 1.267 2.025 1.226 1.226 0 0 1-2.002-1.334L8.58 5.963v4.353a1.226 1.226 0 1 1-1.008-.036V5.887a1.226 1.226 0 0 1-.666-1.608L5.093 2.465l-4.79 4.79a1.03 1.03 0 0 0 0 1.457l6.986 6.986a1.03 1.03 0 0 0 1.457 0l6.953-6.953a1.031 1.031 0 0 0 0-1.457"/>
+        </svg>
+          <span class="visually-hidden">Git</span>
+        </a>
       </div>
-      <div class="d-flex mb-3 mb-md-0 me-md-auto">
-          <div class="btn-group">
-            <a href="https://fosstodon.org/@onfoss" target="_blank" class="btn btn-primary" role="button">
-              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-mastodon" viewBox="0 0 16 16">
-                <path d="M11.19 12.195c2.016-.24 3.77-1.475 3.99-2.603.348-1.778.32-4.339.32-4.339 0-3.47-2.286-4.488-2.286-4.488C12.062.238 10.083.017 8.027 0h-.05C5.92.017 3.942.238 2.79.765c0 0-2.285 1.017-2.285 4.488l-.002.662c-.004.64-.007 1.35.011 2.091.083 3.394.626 6.74 3.78 7.57 1.454.383 2.703.463 3.709.408 1.823-.1 2.847-.647 2.847-.647l-.06-1.317s-1.303.41-2.767.36c-1.45-.05-2.98-.156-3.215-1.928a3.614 3.614 0 0 1-.033-.496s1.424.346 3.228.428c1.103.05 2.137-.064 3.188-.189zm1.613-2.47H11.13v-4.08c0-.859-.364-1.295-1.091-1.295-.804 0-1.207.517-1.207 1.541v2.233H7.168V5.89c0-1.024-.403-1.541-1.207-1.541-.727 0-1.091.436-1.091 1.296v4.079H3.197V5.522c0-.859.22-1.541.66-2.046.456-.505 1.052-.764 1.793-.764.856 0 1.504.328 1.933.983L8 4.39l.417-.695c.429-.655 1.077-.983 1.934-.983.74 0 1.336.259 1.791.764.442.505.661 1.187.661 2.046v4.203z"/>
-              </svg>
-              <span class="visually-hidden">Mastodon</span>
-            </a>
-            <a href="https://peertube.linuxrocks.online/@onfoss" target="_blank" class="btn btn-primary" role="button">
-              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" class="bi" viewBox="0 0 24 24">
-                <path fill="currentColor" d="M12 6.545v10.91L20.727 12M3.273 12v12L12 17.455M3.273 0v12L12 6.545"/>
-              </svg>
-              <span class="visually-hidden">PeerTube</span>
-            </a>
-            <a href="https://onfoss.org/feed.xml" target="_blank" class="btn btn-primary" role="button">
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-rss" viewBox="0 0 16 16">
-              <path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
-              <path d="M5.5 12a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm-3-8.5a1 1 0 0 1 1-1c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1-1-1zm0 4a1 1 0 0 1 1-1 6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1-1-1z"/>
-            </svg>
-              <span class="visually-hidden">RSS</span>
-            </a>
-            <a href="https://git.libregaming.org/onFOSS" target="_blank" class="btn btn-primary" role="button">
-            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-git" viewBox="0 0 16 16">
-              <path d="M15.698 7.287 8.712.302a1.03 1.03 0 0 0-1.457 0l-1.45 1.45 1.84 1.84a1.223 1.223 0 0 1 1.55 1.56l1.773 1.774a1.224 1.224 0 0 1 1.267 2.025 1.226 1.226 0 0 1-2.002-1.334L8.58 5.963v4.353a1.226 1.226 0 1 1-1.008-.036V5.887a1.226 1.226 0 0 1-.666-1.608L5.093 2.465l-4.79 4.79a1.03 1.03 0 0 0 0 1.457l6.986 6.986a1.03 1.03 0 0 0 1.457 0l6.953-6.953a1.031 1.031 0 0 0 0-1.457"/>
-            </svg>
-              <span class="visually-hidden">Git</span>
-            </a>
-          </div>
-        </div>
     </footer>
diff --git a/_includes/nav.html b/_includes/nav.html
index 675562b..885985e 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,4 +1,4 @@
-    <header class="header navbar">
+    <header class="navbar bg-body-tertiary">
       <nav class="container">
         <a href="/" class="navbar-brand fs-4">
           <img class="d-inline-block align-text-bottom" height="36" src="/assets/img/logo.svg" alt="Site icon">
diff --git a/_sass/base.scss b/_sass/base.scss
index e46a514..f85c1fd 100644
--- a/_sass/base.scss
+++ b/_sass/base.scss
@@ -21,10 +21,7 @@ $line-height-base: 1.2;
 $table-color: #C8C8C8;
 $table-bg: #3F3F3E;
 
-
-.titletext {
-  color: #81BB27;
-}
+$body-tertiary-bg: #43543F;
 
 body > .container {
   background-color: #C8C8C8;
@@ -32,10 +29,6 @@ body > .container {
   max-width:1000px;
 }
 
-.header {
-  background-color: #43543F;
-}
-
 .table a{
   color: #81BB27;
 }