diff --git a/templates/auth/account.html b/templates/auth/account.html
index 3fad8ed..c4e4dff 100644
--- a/templates/auth/account.html
+++ b/templates/auth/account.html
@@ -5,13 +5,13 @@
     opacity: 0.5;
   }
 </style>
-<main class="flex-grow flex flex-col prose container mx-auto mt-2">
+<main class="grow flex flex-col prose container mx-auto mt-2">
   <h1 class="text-center">Account Settings</h1>
   <div class="form-control">
     <label class="label">
       <span class="label-text">Email</span>
     </label>
-    <input type="email" name="email" value="{{ user.email }}" class="input !text-gray-100 input-bordered w-full"
+    <input type="email" name="email" value="{{ user.email }}" class="input text-gray-100! input-bordered w-full"
       disabled />
   </div>
   <div class="form-control">
@@ -20,7 +20,7 @@
     </label>
     {% block api_key_section %}
     {% if user.api_key %}
-    <input type="text" name="api-key" value="{{ user.api_key }}" class="input !text-gray-100 input-bordered w-full"
+    <input type="text" name="api-key" value="{{ user.api_key }}" class="input text-gray-100! input-bordered w-full"
       disabled />
     <a href="https://www.icloud.com/shortcuts/66985f7b98a74aaeac6ba29c3f1f0960" class="btn btn-accent mt-4">Download
       iOS
diff --git a/templates/auth/signin_form.html b/templates/auth/signin_form.html
index ff5b53c..96d7406 100644
--- a/templates/auth/signin_form.html
+++ b/templates/auth/signin_form.html
@@ -8,7 +8,7 @@
 
 <div class="min-h-[100dvh] container mx-auto px-4 sm:px-0 sm:max-w-md flex justify-center flex-col">
   <h1
-    class="text-5xl sm:text-6xl py-4 pt-10 font-bold bg-gradient-to-r from-primary to-secondary text-center text-transparent bg-clip-text">
+    class="text-5xl sm:text-6xl py-4 pt-10 font-bold bg-linear-to-r from-primary to-secondary text-center text-transparent bg-clip-text">
     Minne
   </h1>
   <h2 class="text-2xl font-bold text-center mb-8">Login to your account</h2>
diff --git a/templates/auth/signup_form.html b/templates/auth/signup_form.html
index 1e38c88..7c0236f 100644
--- a/templates/auth/signup_form.html
+++ b/templates/auth/signup_form.html
@@ -9,7 +9,7 @@
 
 <div class="min-h-[100dvh] container mx-auto px-4 sm:px-0 sm:max-w-md flex justify-center flex-col">
   <h1
-    class="text-5xl sm:text-6xl py-4 pt-10 font-bold bg-gradient-to-r from-primary to-secondary text-center text-transparent bg-clip-text">
+    class="text-5xl sm:text-6xl py-4 pt-10 font-bold bg-linear-to-r from-primary to-secondary text-center text-transparent bg-clip-text">
     Minne
   </h1>
   <h2 class="text-2xl font-bold text-center mb-8">Create your account</h2>
diff --git a/templates/documentation/index.html b/templates/documentation/index.html
index 3d99623..5b7ed92 100644
--- a/templates/documentation/index.html
+++ b/templates/documentation/index.html
@@ -1,8 +1,8 @@
 {% extends "body_base.html" %}
 {% block main %}
-<main class="flex justify-center flex-grow mt-2 sm:mt-4">
+<main class="flex justify-center grow mt-2 sm:mt-4">
   <div class="container">
-    <div class="grid grid-cols-1 lg:grid-cols-[auto,1fr] gap-4">
+    <div class="grid grid-cols-1 lg:grid-cols-[auto_1fr] gap-4">
       <!-- Documentation Menu -->
       <aside class="bg-base-200 rounded-lg p-4">
         {% include "documentation/menu.html" %}
diff --git a/templates/gdpr.html b/templates/gdpr.html
index 8f68f12..4f4aafb 100644
--- a/templates/gdpr.html
+++ b/templates/gdpr.html
@@ -1,5 +1,5 @@
 <div id="gdpr-banner"
-  class="fixed inset-x-0 mx-auto card max-w-screen-sm mb-2 bg-neutral text-neutral-content bottom-0">
+  class="fixed inset-x-0 mx-auto card max-w-(--breakpoint-sm) mb-2 bg-base-200 text-neutral-content bottom-0">
   <div class="card-body items-center text-center">
     <p class="text-sm"> We use cookies to enhance your experience. By continuing to visit this site, you agree to
       our use cookies.
diff --git a/templates/index/hero.html b/templates/index/hero.html
index 1e28fb0..fb87bdb 100644
--- a/templates/index/hero.html
+++ b/templates/index/hero.html
@@ -1,9 +1,9 @@
-<main class="hero flex-grow flex justify-center ">
+<main class="hero grow flex justify-center ">
   <div class="container hero-content text-center">
     <div class="space-y-8">
       <!-- Hero Section -->
       <h1
-        class="text-5xl sm:text-6xl py-4 pt-10 font-bold bg-gradient-to-r from-primary to-secondary text-transparent bg-clip-text">
+        class="text-5xl sm:text-6xl py-4 pt-10 font-bold bg-linear-to-r from-primary to-secondary text-transparent bg-clip-text">
         Simplify Your Knowledge Management
       </h1>
       <p class="text-xl text-base-content/70">
diff --git a/templates/index/signed_in_view.html b/templates/index/signed_in_view.html
index 200ec4a..440a405 100644
--- a/templates/index/signed_in_view.html
+++ b/templates/index/signed_in_view.html
@@ -1,4 +1,4 @@
-<div class="container mx-auto p-4 max-w-screen-lg flex-col flex justify-center gap-6">
+<div class="container mx-auto p-4 max-w-(--breakpoint-lg) flex-col flex justify-center gap-6">
   <!-- Search Bar -->
   <div class="form-control w-full mx-auto mt-8">
     <h1 class="textl-lg text-center pb-5">So here you can search all your ingressed documents</h1>
diff --git a/templates/ingress_form.html b/templates/ingress_form.html
index 227683f..08e7d11 100644
--- a/templates/ingress_form.html
+++ b/templates/ingress_form.html
@@ -1,6 +1,6 @@
 {% extends "body_base.html" %}
 {% block main %}
-<div class="container px-4 max-w-screen-lg">
+<div class="container px-4 max-w-(--breakpoint-lg)">
   <form class="space-y-2" hx-post="/ingress" enctype="multipart/form-data">
     <h1 class="text-2xl">Add content to the database </h1>
     <label class="label label-text">Instructions</label>
diff --git a/templates/privacy_policy.html b/templates/privacy_policy.html
index c122bde..4db0176 100644
--- a/templates/privacy_policy.html
+++ b/templates/privacy_policy.html
@@ -1,6 +1,6 @@
 {% extends 'body_base.html' %}
 {% block main %}
-<main class="container justify-center flex-grow flex mx-auto mt-4 p-5">
+<main class="container justify-center grow flex mx-auto mt-4 p-5">
   <article class="prose">
     <h1>Privacy Policy</h1>