diff --git a/css/login_signup.css b/css/login_signup.css
index f2d2e93..a289f64 100644
--- a/css/login_signup.css
+++ b/css/login_signup.css
@@ -1,87 +1,7 @@
-/* Grundlegende Resets */
-* {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-}
-
-body {
-    font-family: Arial, sans-serif;
-    background-color: #f5f5f5;
-    display: flex;
-    flex-direction: column;
-    min-height: 100vh;
-}
-
-/* Header Styles */
-.header {
-    background-color: white;
-    box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
-    padding: 15px 30px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.header-logo {
-    font-size: 24px;
-    font-weight: bold;
-    color: #0084ff;
-    text-decoration: none;
-    letter-spacing: 1px;
-}
-
-.header-buttons {
-    display: flex;
-    gap: 15px;
-    align-items: center;
-}
-
-.header-btn {
-    padding: 10px 20px;
-    border: none;
-    border-radius: 4px;
-    font-size: 14px;
-    font-weight: bold;
-    cursor: pointer;
-    transition: all 0.3s ease;
-    text-decoration: none;
-    display: inline-block;
-}
-
-.header-btn-secondary {
-    background-color: transparent;
-    color: #0084ff;
-    border: 2px solid #0084ff;
-}
-
-.header-btn-secondary:hover {
-    background-color: #0084ff;
-    color: white;
-}
-
-.header-btn-primary {
-    background-color: #0084ff;
-    color: white;
-}
-
-.header-btn-primary:hover {
-    background-color: #0073e6;
-}
-
-/* Main content wrapper */
-.main-content {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex: 1;
-    padding: 20px;
-}
-
 .container {
-    background-color: white;
-    border-radius: 8px;
-    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+    margin-top: 5rem;
+    background-color: var(--white);
+    border-radius: var(--radius-lg);
     max-width: 1000px;
     width: 100%;
     display: flex;
@@ -91,7 +11,7 @@ body {
 
 .image-section {
     flex: 1;
-    background-color: #e8f4f8;
+    background-color: var(--white);
     display: flex;
     align-items: center;
     justify-content: center;
@@ -113,21 +33,14 @@ body {
 }
 
 /* Formularelemente */
-h1 {
-    color: #333;
-    margin-bottom: 20px;
-    text-align: center;
-}
-
 .info-box {
-    background-color: #e8f4f8;
-    border-left: 4px solid #0084ff;
+    background-color: var(--olive-light);
     padding: 15px;
     margin-bottom: 30px;
-    border-radius: 4px;
-    font-size: 14px;
-    color: #333;
-    line-height: 1.5;
+    border-radius: 8px;
+    font-size: 16px;
+    color: var(--black);
+    line-height: 1.4;
 }
 
 .form-group {
@@ -137,8 +50,8 @@ h1 {
 label {
     display: block;
     margin-bottom: 6px;
-    color: #333;
-    font-weight: bold;
+    color: var(--black);
+    font-weight: 500;
     font-size: 14px;
 }
 
@@ -151,66 +64,46 @@ input[type="password"] {
     border-radius: 4px;
     font-size: 14px;
     transition: border-color 0.3s ease;
-    font-family: Arial, sans-serif;
 }
 
 input:focus {
     outline: none;
-    border-color: #0084ff;
-    box-shadow: 0 0 5px rgba(0, 132, 255, 0.3);
+    border-color: var(--olive-dark);
 }
 
-button {
-    width: 100%;
-    padding: 12px;
-    background-color: #0084ff;
-    color: white;
-    border: none;
-    border-radius: 4px;
-    font-size: 16px;
-    font-weight: bold;
-    cursor: pointer;
-    transition: background-color 0.3s ease;
-    margin-top: 10px;
-}
 
-button:hover {
-    background-color: #0073e6;
-}
-
-button:active {
-    background-color: #0063cc;
-}
 
 /* Hilfstexte & Fehler */
 .signup-hint, .login-hint {
-    text-align: center;
+    text-align: left;
     margin-top: 20px;
-    color: #666;
-    font-size: 14px;
+    color: var(--black);
+    font-size: 1rem;
+    line-height: 130%;
 }
 
 .signup-hint a, .login-hint a {
-    color: #0084ff;
+    color: var(--blue);
     text-decoration: none;
-    font-weight: bold;
+    font-weight: 500;
     transition: color 0.3s ease;
 }
 
 .signup-hint a:hover, .login-hint a:hover {
     text-decoration: underline;
+    text-underline-offset: 2px; 
+    color: var(--blue);
 }
 
 .error-message {
-    color: #d32f2f;
+    color: var(--error);
     font-size: 13px;
     margin-top: 5px;
     display: none;
 }
 
 .form-group.has-error input {
-    border-color: #d32f2f;
-    box-shadow: 0 0 5px rgba(211, 47, 47, 0.3);
+    border-color: var(--error);
 }
 
 .form-group.has-error .error-message {