diff --git a/src/app/components/access/access.component.html b/src/app/components/access/access.component.html
index d59b181..3dba0e0 100644
--- a/src/app/components/access/access.component.html
+++ b/src/app/components/access/access.component.html
@@ -1,4 +1,4 @@
-<div class="surface-50 flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
+<div class="surface-0 flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
     <div class="grid justify-content-center p-2 lg:p-0" style="min-width:80%">
         <div class="col-12 mt-5 xl:mt-0 text-center">
             <img src="assets/layout/images/logo-orange.svg" alt="Sakai logo" class="mb-5" style="width:81px; height:60px;">
diff --git a/src/app/components/error/error.component.html b/src/app/components/error/error.component.html
index 9b7480f..f0e7f5a 100644
--- a/src/app/components/error/error.component.html
+++ b/src/app/components/error/error.component.html
@@ -1,10 +1,10 @@
-<div class="surface-50 flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
+<div class="surface-0 flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
     <div class="grid justify-content-center p-2 lg:p-0" style="min-width:80%;">
         <div class="col-12 mt-5 xl:mt-0 text-center">
             <img src="assets/layout/images/logo-error.svg" alt="Sakai logo" class="mb-5" style="width:81px; height:60px;">
         </div>
         <div class="col-12 xl:col-6" style="border-radius:56px; padding:0.3rem; background: linear-gradient(180deg, rgba(233, 30, 99, 0.4) 10%, rgba(33, 150, 243, 0) 30%);">
-            <div class="surface-50 h-full w-full m-0 py-7 px-4" style="border-radius:53px; background: linear-gradient(180deg, var(--surface-50) 38.9%, var(--surface-0));">
+            <div class="h-full w-full m-0 py-7 px-4" style="border-radius:53px; background: linear-gradient(180deg, var(--surface-50) 38.9%, var(--surface-0));">
                 <div class="grid flex flex-column align-items-center">
                     <div class="flex justify-content-center align-items-center bg-pink-500 border-circle" style="height:3.2rem; width:3.2rem;">
                         <i class="pi pi-fw pi-exclamation-circle text-2xl text-white"></i>
diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html
index a2327a4..bd4dfc5 100644
--- a/src/app/components/login/login.component.html
+++ b/src/app/components/login/login.component.html
@@ -1,10 +1,10 @@
-<div class="surface-50 flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
+<div class="surface-0 flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
     <div class="grid justify-content-center p-2 lg:p-0" style="min-width:80%">
         <div class="col-12 mt-5 xl:mt-0 text-center">
             <img src="assets/layout/images/{{config.dark ? 'logo-white' : 'logo-dark'}}.svg" alt="Sakai logo" class="mb-5" style="width:81px; height:60px;">
         </div>
         <div class="col-12 xl:col-6" style="border-radius:56px; padding:0.3rem; background: linear-gradient(180deg, var(--primary-color) 10%, rgba(33, 150, 243, 0) 30%);">
-            <div class="surface-50 h-full w-full m-0 py-7 px-4" style="border-radius:53px; background: linear-gradient(180deg, var(--surface-50) 38.9%, var(--surface-0));">
+            <div class="h-full w-full m-0 py-7 px-4" style="border-radius:53px; background: linear-gradient(180deg, var(--surface-50) 38.9%, var(--surface-0));">
                 <div class="text-center mb-5">
                     <img src="assets/layout/images/avatar.png" alt="Image" height="50" class="mb-3">
                     <div class="text-900 text-3xl font-medium mb-3">Welcome, Isabel!</div>
diff --git a/src/app/components/notfound/notfound.component.html b/src/app/components/notfound/notfound.component.html
index 4582929..fd53ef0 100644
--- a/src/app/components/notfound/notfound.component.html
+++ b/src/app/components/notfound/notfound.component.html
@@ -1,10 +1,10 @@
-<div class="surface-50 flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
+<div class="surface-0 flex align-items-center justify-content-center min-h-screen min-w-screen overflow-hidden">
     <div class="grid justify-content-center p-2 lg:p-0" style="min-width:80%">
         <div class="col-12 mt-5 xl:mt-0 text-center">
             <img src="assets/layout/images/logo-blue.svg" alt="Sakai logo" class="mb-5" style="width:81px; height:60px;">
         </div>
         <div class="col-12 xl:col-6" style="border-radius:56px; padding:0.3rem; background: linear-gradient(180deg, rgba(33, 150, 243, 0.4) 10%, rgba(33, 150, 243, 0) 30%);">
-            <div class="surface-50 flex justify-content-center h-full w-full m-0 py-7 px-4" style="border-radius:53px; background: linear-gradient(180deg, var(--surface-50) 38.9%, var(--surface-0));">
+            <div class="flex justify-content-center h-full w-full m-0 py-7 px-4" style="border-radius:53px; background: linear-gradient(180deg, var(--surface-50) 38.9%, var(--surface-0));">
                 <div class="grid flex-column align-items-center">
                     <span class="text-blue-500 font-bold text-3xl">404</span>
                     <h1 class="text-900 font-bold text-3xl lg:text-5xl mb-2">Looks like you are lost</h1>
@@ -14,7 +14,7 @@
                             <i class="text-50 pi pi-fw pi-table text-2xl"></i>
                         </div>
                         <div class="ml-4">
-                            <p class="text-900 lg:text-xl font-medium mb-1 block">Frequently Asked Questions</p>
+                            <p class="text-900 lg:text-xl font-medium mb-0 block">Frequently Asked Questions</p>
                             <span class="text-600 lg:text-xl">Ultricies mi quis hendrerit dolor.</span>
                         </div>
                     </a>