diff --git a/src/main/resources/templates/ExceptionMappers/error.html b/src/main/resources/templates/ExceptionMappers/error.html
index 4eea55e..3de31f8 100644
--- a/src/main/resources/templates/ExceptionMappers/error.html
+++ b/src/main/resources/templates/ExceptionMappers/error.html
@@ -1,77 +1,16 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Login Page</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            background-color: #f4f4f4;
-            margin: 0;
-            padding: 0;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            height: 100vh;
-        }
-
-        .login-container {
-            background-color: #fff;
-            padding: 20px;
-            border-radius: 5px;
-            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-        }
-
-        .login-container h2 {
-            text-align: center;
-        }
-
-        .form-group {
-            margin-bottom: 20px;
-        }
-
-        .form-group label {
-            font-weight: bold;
-            display: block;
-        }
-
-        .form-group input {
-            width: 100%;
-            padding: 10px;
-            border: 1px solid #ccc;
-            border-radius: 5px;
-        }
-
-        .login-button {
-            width: 100%;
-            background-color: #007BFF;
-            color: #fff;
-            border: none;
-            padding: 10px;
-            border-radius: 5px;
-            cursor: pointer;
-        }
-
-        .login-button:hover {
-            background-color: #0056b3;
-        }
-
-        .error-popup {
-            background-color: #ff6b6b;
-            color: #fff;
-            padding: 10px;
-            text-align: center;
-            border-radius: 5px;
-            margin-top: 10px;
-        }
-    </style>
-</head>
-<body>
-<div class="login-container">
-    <h2>Error</h2>
-    <div class="error-code" id="error-code">{response.error}</div>
-    <div class="error-popup" id="error-popup">{response.description}</div>
+{#include base}
+{#title}Error{/title}
+<div class="container">
+    <div class="row">
+        <div class="col s12 m6 offset-m3">
+            <div class="card">
+                <div class="card-content">
+                    <span class="card-title center-align">Error</span>
+                    <p>{response.error}</p>
+                    <div class="error-popup" id="error-popup">{response.description}</div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
-</body>
-</html>
+{/include}
diff --git a/src/main/resources/templates/OAuthResource/loginSuccess.html b/src/main/resources/templates/OAuthResource/loginSuccess.html
index ad45367..ba7ab57 100644
--- a/src/main/resources/templates/OAuthResource/loginSuccess.html
+++ b/src/main/resources/templates/OAuthResource/loginSuccess.html
@@ -1,76 +1,15 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Login Page</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            background-color: #f4f4f4;
-            margin: 0;
-            padding: 0;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            height: 100vh;
-        }
-
-        .login-container {
-            background-color: #fff;
-            padding: 20px;
-            border-radius: 5px;
-            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-        }
-
-        .login-container h2 {
-            text-align: center;
-        }
-
-        .form-group {
-            margin-bottom: 20px;
-        }
-
-        .form-group label {
-            font-weight: bold;
-            display: block;
-        }
-
-        .form-group input {
-            width: 100%;
-            padding: 10px;
-            border: 1px solid #ccc;
-            border-radius: 5px;
-        }
-
-        .login-button {
-            width: 100%;
-            background-color: #007BFF;
-            color: #fff;
-            border: none;
-            padding: 10px;
-            border-radius: 5px;
-            cursor: pointer;
-        }
-
-        .login-button:hover {
-            background-color: #0056b3;
-        }
-
-        .error-popup {
-            background-color: #ff6b6b;
-            color: #fff;
-            padding: 10px;
-            text-align: center;
-            border-radius: 5px;
-            margin-top: 10px;
-        }
-    </style>
-</head>
-<body>
-<div class="login-container">
-    <h2>Successful login</h2>
-    <p>You may close this window</p>
+{#include base}
+{#title}Login successful{/title}
+<div class="container">
+    <div class="row">
+        <div class="col s12 m6 offset-m3">
+            <div class="card">
+                <div class="card-content centered">
+                    <span class="card-title center-align">Successful login</span>
+                    <h6 style="margin: 50px 0;">You may now close this window</h6>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
-</body>
-</html>
+{/include}
