diff --git a/server/assets/src/api-404.html b/server/assets/src/api-404.html
index 24404785e..d9ba94a7f 100644
--- a/server/assets/src/api-404.html
+++ b/server/assets/src/api-404.html
@@ -56,7 +56,7 @@
 
         </main>
         <footer class="p-5 text-white">
-            Access source code on<a href="https://github.com/cortezaproject/" target="_blank" class="text-white ml-2">GitHub</a>
+            Access source code on<a href="https://github.com/cortezaproject/" target="_blank" class="text-white ml-1">GitHub</a>
         </footer>
     </body>
 </html>
diff --git a/server/assets/src/api-landing.html b/server/assets/src/api-landing.html
index 24134a75b..1893038e7 100644
--- a/server/assets/src/api-landing.html
+++ b/server/assets/src/api-landing.html
@@ -57,7 +57,7 @@
 
         </main>
         <footer class="p-5 text-white">
-            Access source code on<a href="https://github.com/cortezaproject/" target="_blank" class="text-white ml-2">GitHub</a>
+            Access source code on<a href="https://github.com/cortezaproject/" target="_blank" class="text-white ml-1">GitHub</a>
         </footer>
     </body>
 </html>
diff --git a/server/auth/assets/public/fonts.css b/server/auth/assets/public/fonts.css
new file mode 100644
index 000000000..1d2360626
--- /dev/null
+++ b/server/auth/assets/public/fonts.css
@@ -0,0 +1,39 @@
+@font-face {
+    font-family: 'Poppins-Bold';
+    src: url('./fonts/poppins/Poppins-Bold.ttf') format('truetype');
+    font-weight: 100 900;
+    font-style: normal;
+    font-display: swap;
+}
+
+@font-face {
+    font-family: 'Poppins-Medium';
+    src: url('./fonts/poppins/Poppins-Medium.ttf') format('truetype');
+    font-weight: 100 900;
+    font-style: normal;
+    font-display: swap;
+}
+
+@font-face {
+    font-family: 'Poppins-Regular';
+    src: url('./fonts/poppins/Poppins-Regular.ttf') format('truetype');
+    font-weight: 100 900;
+    font-style: normal;
+    font-display: swap;
+}
+
+@font-face {
+    font-family: 'Poppins-SemiBold';
+    src: url('./fonts/poppins/Poppins-SemiBold.ttf') format('truetype');
+    font-weight: 100 900;
+    font-style: normal;
+    font-display: swap;
+}
+
+@font-face {
+    font-family: 'Poppins-Italic';
+    src: url('./fonts/poppins/Poppins-Italic.ttf') format('truetype');
+    font-weight: 100 900;
+    font-style: italic;
+    font-display: swap;
+}
diff --git a/server/auth/assets/public/fonts/poppins/Poppins-Italic.ttf b/server/auth/assets/public/fonts/poppins/Poppins-Italic.ttf
new file mode 100644
index 000000000..46203996d
Binary files /dev/null and b/server/auth/assets/public/fonts/poppins/Poppins-Italic.ttf differ
diff --git a/server/auth/assets/public/style.css b/server/auth/assets/public/style.css
index cc2a0ddf6..f2109f1e6 100644
--- a/server/auth/assets/public/style.css
+++ b/server/auth/assets/public/style.css
@@ -1,20 +1,16 @@
-:root {
-  --primary: #0B344E;
-  --primary-hover: #061E2C;
-  --light: #F3F5F7;
-  --danger: #E54122;
-}
-
 html {
   height: 100%;
 }
 
-
 body {
-  font-family: 'Poppins', sans-serif;
   min-height: 100%;
   display: grid;
   grid-template-rows: auto;
+  overflow: auto;
+}
+
+label {
+  color: var(--primary);
 }
 
 .logo {
@@ -27,75 +23,8 @@ body {
   right: 0;
 }
 
-.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
-  font-family: 'Poppins';
-  font-weight: 600;
-}
-
-thead th,
-legend,
-label,
-a,
-.btn {
-  font-family: 'Poppins';
-}
-
-strong,
-b,
-.font-weight-bold {
-  font-family: 'Poppins';
-  font-weight: 600;
-}
-
-/* over-ride default variables colors */
-a, label, .text-primary {
-  color: var(--primary) !important;
-}
-
-a:hover {
-  color: var(--primary-hover);
-}
-
-.text-danger {
-  color: var(--danger) !important;
-}
-
-.card,
-.card-header {
-  border-radius: 1rem;
-}
-
 .header {
-  background-color: #F4F7FA;
-  border-radius: 10px 10px 0 0 !important;
-}
-
-.btn-primary,
-.bg-primary {
-  background-color: var(--primary)!important;
-  border-color: var(--primary);
-}
-
-.btn-primary:hover {
-  background-color: var(--primary-hover)!important;
-  border-color: var(--primary-hover);
-}
-
-.btn-light,
-.bg-light,
-.badge-light {
-  background-color: var(--light)!important;
-  border-color: var(--light);
-}
-
-.btn-danger,
-.bg-danger {
-  background-color: var(--danger)!important;
-  border-color: var(--danger);
-}
-
-.btn-lg {
-  font-size: 1rem;
+  background-color: var(--light) !important;
 }
 
 /* Navigation */
@@ -107,25 +36,6 @@ a:hover {
   font-size: 25px;
 }
 
-/* form styling*/
-.form-control {
-  border: 2px solid var(--light);
-  padding: 1.25rem 0.75rem;
-}
-
-.input-color {
-  padding: 0.125rem 0.25rem;
-}
-
-select.form-control {
-  padding: 0 0.5rem;
-}
-
-.form-control:focus {
-  box-shadow: none;
-  border-color: var(--primary);
-}
-
 .auth {
   width: 100%;
   max-width: 650px;
@@ -136,15 +46,3 @@ select.form-control {
 .footer {
   margin-top: auto;
 }
-
-input:-webkit-autofill::first-line {
-  font-family: 'Poppins';
-  font-size: 1rem;
-  color: #495057;
-}
-
-/* position bootstrap icons on buttons centrally */
-[class^="bi-"]::before, [class*=" bi-"]::before {
-  vertical-align: middle;
-  line-height: 1.6;
-}
diff --git a/server/auth/assets/templates/authorized-clients.html.tpl b/server/auth/assets/templates/authorized-clients.html.tpl
index 7edc2c44c..bdadeed7d 100644
--- a/server/auth/assets/templates/authorized-clients.html.tpl
+++ b/server/auth/assets/templates/authorized-clients.html.tpl
@@ -1,6 +1,5 @@
 {{ template "inc_header.html.tpl" set . "activeNav" "clients" }}
 <div class="card-body p-0">
-    <h4 class="card-title p-3 border-bottom">{{ tr "authorized-clients.template.title" }}</h4>
 	<form
 		method="POST"
 		class="clearfix"
diff --git a/server/auth/assets/templates/change-password.html.tpl b/server/auth/assets/templates/change-password.html.tpl
index 742827655..9ffbc0782 100644
--- a/server/auth/assets/templates/change-password.html.tpl
+++ b/server/auth/assets/templates/change-password.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" set . "activeNav" "security" }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "change-password.template.title" }}</h4>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "change-password.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.ChangePassword }}"
diff --git a/server/auth/assets/templates/create-password.html.tpl b/server/auth/assets/templates/create-password.html.tpl
index ac7582180..408e1288f 100644
--- a/server/auth/assets/templates/create-password.html.tpl
+++ b/server/auth/assets/templates/create-password.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" set . "activeNav" "security" }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "create-password.template.title" }}</h4>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "create-password.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.CreatePassword }}"
diff --git a/server/auth/assets/templates/error-internal.html.tpl b/server/auth/assets/templates/error-internal.html.tpl
index d036c43f0..2274cb6f2 100644
--- a/server/auth/assets/templates/error-internal.html.tpl
+++ b/server/auth/assets/templates/error-internal.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "error-internal.template.title" }}</h4>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "error-internal.template.title" }}</h4>
 	<div class="text-danger mb-4 font-weight-bold p-3" role="alert">
 		{{ .error }}
 	</div>
diff --git a/server/auth/assets/templates/inc_footer.html.tpl b/server/auth/assets/templates/inc_footer.html.tpl
index 2d70de1d4..ca3063e23 100644
--- a/server/auth/assets/templates/inc_footer.html.tpl
+++ b/server/auth/assets/templates/inc_footer.html.tpl
@@ -1,7 +1,8 @@
 		</main>
 		{{ template "inc_toasts.html.tpl" .alerts }}
 		<footer class="d-flex align-items-end justify-content-center text-white py-4">
-			{{ tr "inc_footer.code-link" }}<a data-test-id="link-github" href="https://github.com/cortezaproject/" target="_blank" class="text-white ml-2">GitHub</a>
+			{{ tr "inc_footer.code-link" }}
+			<a data-test-id="link-github" href="https://github.com/cortezaproject/" target="_blank" class="text-white ml-1">GitHub</a>
 		</footer>
 	</body>
 	<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
diff --git a/server/auth/assets/templates/inc_header.html.tpl b/server/auth/assets/templates/inc_header.html.tpl
index 7a11891f6..49145719b 100644
--- a/server/auth/assets/templates/inc_header.html.tpl
+++ b/server/auth/assets/templates/inc_header.html.tpl
@@ -1,21 +1,23 @@
 <!doctype html>
-<html lang="{{ language }}">
+<html data-color-mode="{{ .theme }}" lang="{{ language }}">
 
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<!-- Bootstrap core CSS -->
-	<link href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css" rel="stylesheet">
 	<!-- Bootstrap icons -->
 	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.3.0/font/bootstrap-icons.css">
 	<link rel="preconnect" href="https://fonts.googleapis.com">
 	<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-	<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@500;700&display=swap" rel="stylesheet">
+
+    <!-- Fonts -->
+    <link href="{{ links.AuthAssets }}/fonts.css" rel="stylesheet">
 	<!-- Custom CSS -->
+	<link href="/custom.css" rel="stylesheet">
 	<link href="{{ links.AuthAssets }}/style.css?{{ buildtime }}" rel="stylesheet">
 	<title>Corteza</title>
 	<style>
 		body {
+			font-size: 1rem !important;
 			{{ safeCSS .authBg }}
 			background-size: cover;
 			background-attachment: fixed;
@@ -26,19 +28,22 @@
 <body>
 	<header>
 		{{ if .user }}
-		<div class="float-right text-white m-2">
-			<a class="font-weight-bold text-white" href="{{ links.Base }}"><i
-					class="bi bi-grid-3x2-gap-fill text-white mr-1 align-middle" style="font-size: 1.4rem;"></i></a>
+		<div class="d-flex justify-content-end align-items-center text-white m-2">
+			<a class="text-white mt-n2" href="{{ links.Base }}">
+				<i class="bi bi-grid-3x2-gap-fill mr-2" style="font-size: 1.4rem;"></i>
+			</a>
 			{{ tr "inc_header.logged-in-as" }}
-			<a data-test-id="link-redirect-to-profile" class="font-weight-bold text-white"
-				href="{{ links.Profile }}">{{ coalesce .user.Name .user.Handle .user.Email }}</a>
+			<a data-test-id="link-redirect-to-profile" class="font-weight-bold text-white mx-2"
+			 href="{{ links.Profile }}">{{ coalesce .user.Name .user.Handle .user.Email }}
+			</a>
 			|
-			<a data-test-id="link-logout" class="font-weight-bold text-white"
-				href="{{ links.Logout }}">{{ tr "inc_header.logout" }}</a>
+			<a data-test-id="link-logout" class="font-weight-bold text-white ml-2" href="{{ links.Logout }}">
+			 {{ tr "inc_header.logout" }}
+			</a>
 		</div>
 		{{ end }}
 	</header>
 
 	<main class="auth mt-sm-5">
-		<div class="card">
-{{ template "inc_nav.html.tpl" . }}
\ No newline at end of file
+		<div class="tabs card">
+{{ template "inc_nav.html.tpl" . }}
diff --git a/server/auth/assets/templates/inc_nav.html.tpl b/server/auth/assets/templates/inc_nav.html.tpl
index dee2086f2..d074d83ed 100644
--- a/server/auth/assets/templates/inc_nav.html.tpl
+++ b/server/auth/assets/templates/inc_nav.html.tpl
@@ -13,7 +13,7 @@
 
 {{ if not .hideNav }}
 	{{ if .user }}
-	<ul class="nav ml-1 d-flex justify-content-around">
+	<ul class="nav d-flex justify-content-around">
 		<li class="nav-item {{ if eq $activeNav "profile" }}active{{ end  }}">
 			<a
 				data-test-id="link-tab-profile"
diff --git a/server/auth/assets/templates/invite.html.tpl b/server/auth/assets/templates/invite.html.tpl
index 8abafbf02..972d946d7 100644
--- a/server/auth/assets/templates/invite.html.tpl
+++ b/server/auth/assets/templates/invite.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "invite.template.title" }}</h4>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "invite.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.AcceptInvite }}"
diff --git a/server/auth/assets/templates/login.html.tpl b/server/auth/assets/templates/login.html.tpl
index dccead220..c3c249c5e 100644
--- a/server/auth/assets/templates/login.html.tpl
+++ b/server/auth/assets/templates/login.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h4 class="login-title card-title p-3 border-bottom">{{ tr "login.template.title" }}</h4>
+	<h4 class="login-title mb-0 p-3 border-bottom">{{ tr "login.template.title" }}</h4>
 	{{ if .settings.LocalEnabled }}
 	<form
 		method="POST"
@@ -62,7 +62,7 @@
 				{{ end }}
 				<button
 					data-test-id="button-login"
-					class="btn btn-light btn-block"
+					class="btn btn-light btn-block btn-lg"
 					type="submit"
 				>
 					{{ tr "login.template.form.button.login" }}
@@ -109,7 +109,7 @@
 	</div>
 	{{ end }}
 
-	{{ if .settings.ExternalEnabled }}
+	{{ if and .settings.ExternalEnabled .providers}}
 	<div class="px-3 pb-3">
 	{{ range .providers }}
 		<a href="{{ links.External }}/{{ .Handle }}" class="btn btn-light btn-block btn-lg mb-2 mt-1 text-dark">
diff --git a/server/auth/assets/templates/mfa-totp-disable.html.tpl b/server/auth/assets/templates/mfa-totp-disable.html.tpl
index b803ac995..6e7c2ad42 100644
--- a/server/auth/assets/templates/mfa-totp-disable.html.tpl
+++ b/server/auth/assets/templates/mfa-totp-disable.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl"  set . "hideNav" true }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "mfa-totp-disable.template.title" }}</h4>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "mfa-totp-disable.template.title" }}</h4>
 
 	<form
 		class="p-3"
diff --git a/server/auth/assets/templates/mfa-totp.html.tpl b/server/auth/assets/templates/mfa-totp.html.tpl
index c3f22bbc6..65afbfb13 100644
--- a/server/auth/assets/templates/mfa-totp.html.tpl
+++ b/server/auth/assets/templates/mfa-totp.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl"  set . "hideNav" true }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "mfa-totp.template.title" }}</h4>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "mfa-totp.template.title" }}</h4>
 
 	{{ if .enforced }}
 	<p
diff --git a/server/auth/assets/templates/mfa.html.tpl b/server/auth/assets/templates/mfa.html.tpl
index ab0b674d5..8b8a32312 100644
--- a/server/auth/assets/templates/mfa.html.tpl
+++ b/server/auth/assets/templates/mfa.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" set . "hideNav" true }}
 <div class="card-body p-0 mb-2">
-	<h4 class="card-title p-3 border-bottom">{{ tr "mfa.template.title" }}</h4>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "mfa.template.title" }}</h4>
 
 	{{ if .emailOtpPending }}
 	<form
diff --git a/server/auth/assets/templates/oauth2-authorize-client.html.tpl b/server/auth/assets/templates/oauth2-authorize-client.html.tpl
index 399866a5c..7656dd914 100644
--- a/server/auth/assets/templates/oauth2-authorize-client.html.tpl
+++ b/server/auth/assets/templates/oauth2-authorize-client.html.tpl
@@ -7,7 +7,7 @@
 	</div>
 	{{ end }}
 
-	<h4 class="card-title p-3 border-bottom">{{ tr "oauth2-authorize-client.template.title" }} "{{ coalesce .client.Name }}"</h1>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "oauth2-authorize-client.template.title" }} "{{ coalesce .client.Name }}"</h1>
 
 	<form
 		action="{{ links.OAuth2AuthorizeClient }}"
diff --git a/server/auth/assets/templates/password-reset-requested.html.tpl b/server/auth/assets/templates/password-reset-requested.html.tpl
index 538bf38c2..d06307612 100644
--- a/server/auth/assets/templates/password-reset-requested.html.tpl
+++ b/server/auth/assets/templates/password-reset-requested.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "password-reset-requested.template.title" }}</h4>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "password-reset-requested.template.title" }}</h4>
 	<div
 		data-test-id="div-reset-instructions"
 		class="p-3"
diff --git a/server/auth/assets/templates/pending-email-confirmation.html.tpl b/server/auth/assets/templates/pending-email-confirmation.html.tpl
index 8039d087c..3bfe8a4a5 100644
--- a/server/auth/assets/templates/pending-email-confirmation.html.tpl
+++ b/server/auth/assets/templates/pending-email-confirmation.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "pending-email-confirmation.template.title" }}</h4>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "pending-email-confirmation.template.title" }}</h4>
 	<div class="p-3" role="alert">
 		{{ tr "pending-email-confirmation.template.instructions" }}
 	</div>
diff --git a/server/auth/assets/templates/profile.html.tpl b/server/auth/assets/templates/profile.html.tpl
index 7561a2823..ff7a93106 100644
--- a/server/auth/assets/templates/profile.html.tpl
+++ b/server/auth/assets/templates/profile.html.tpl
@@ -1,7 +1,5 @@
 {{ template "inc_header.html.tpl" set . "activeNav" "profile" }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "profile.template.title" }}</h4>
-
 	<form
 		method="POST"
 		action="{{ links.Profile }}"
diff --git a/server/auth/assets/templates/request-password-reset.html.tpl b/server/auth/assets/templates/request-password-reset.html.tpl
index bc48456cc..6c73338d9 100644
--- a/server/auth/assets/templates/request-password-reset.html.tpl
+++ b/server/auth/assets/templates/request-password-reset.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "request-password-reset.template.title" }}</h4>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "request-password-reset.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.RequestPasswordReset }}"
diff --git a/server/auth/assets/templates/reset-password.html.tpl b/server/auth/assets/templates/reset-password.html.tpl
index 4ccf12721..3d96fa6d0 100644
--- a/server/auth/assets/templates/reset-password.html.tpl
+++ b/server/auth/assets/templates/reset-password.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "reset-password.template.title" }}</h4>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "reset-password.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.ResetPassword }}"
diff --git a/server/auth/assets/templates/security.html.tpl b/server/auth/assets/templates/security.html.tpl
index 908c18664..e5bfb8f46 100644
--- a/server/auth/assets/templates/security.html.tpl
+++ b/server/auth/assets/templates/security.html.tpl
@@ -1,6 +1,5 @@
 {{ template "inc_header.html.tpl" set . "activeNav" "security" }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "security.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.Security }}"
diff --git a/server/auth/assets/templates/sessions.html.tpl b/server/auth/assets/templates/sessions.html.tpl
index ecd887c3b..27ebed810 100644
--- a/server/auth/assets/templates/sessions.html.tpl
+++ b/server/auth/assets/templates/sessions.html.tpl
@@ -5,9 +5,9 @@
 		action="{{ links.Sessions }}"
 	>
 		{{ .csrfField }}
-		<div class="card-title p-3 border-bottom">
+		{{- if and .sessions (gt (len .sessions) 1) }}
+		<div class="mb-0 p-3 border-bottom">
 			<h4 class="card-title d-inline">{{ tr "sessions.template.title" }}</h4>
-			{{- if and .sessions (gt (len .sessions) 1) }}
 			<button
 				data-test-id="button-logout-from-everywhere"
 				type="submit"
@@ -17,8 +17,8 @@
 			>
 				{{ tr "sessions.template.delete-all" }}
 			</button>
-		{{ end }}
 		</div>
+		{{ end }}
 	</form>
 	<form
 		method="POST"
diff --git a/server/auth/assets/templates/signup.html.tpl b/server/auth/assets/templates/signup.html.tpl
index 0a0c37289..bec2d793a 100644
--- a/server/auth/assets/templates/signup.html.tpl
+++ b/server/auth/assets/templates/signup.html.tpl
@@ -1,6 +1,6 @@
 {{ template "inc_header.html.tpl" . }}
 <div class="card-body p-0">
-	<h4 class="card-title p-3 border-bottom">{{ tr "signup.template.title" }}</h4>
+	<h4 class="mb-0 p-3 border-bottom">{{ tr "signup.template.title" }}</h4>
 	<form
 		method="POST"
 		action="{{ links.Signup }}"
diff --git a/server/auth/handlers/handler.go b/server/auth/handlers/handler.go
index 0263ad65a..00985f955 100644
--- a/server/auth/handlers/handler.go
+++ b/server/auth/handlers/handler.go
@@ -333,8 +333,16 @@ func (h *AuthHandlers) handle(fn handlerFn) http.HandlerFunc {
 // Add alerts, settings, providers, csrf token, Bg
 func (h *AuthHandlers) enrichTmplData(req *request.AuthReq) interface{} {
 	d := req.Data
+	d["theme"] = "light"
 	if req.AuthUser != nil {
-		req.Data["user"] = req.AuthUser.User
+		// fetch current user with updated fields
+		user, err := h.UserService.FindByAny(req.Context(), req.AuthUser.User.ID)
+		if err != nil {
+			return nil
+		}
+
+		d["user"] = user
+		d["theme"] = user.Meta.Theme
 	}
 
 	if req.Client != nil {
@@ -348,7 +356,7 @@ func (h *AuthHandlers) enrichTmplData(req *request.AuthReq) interface{} {
 			c.Description = req.Client.Meta.Description
 		}
 
-		req.Data["client"] = c
+		d["client"] = c
 	}
 
 	d[csrf.TemplateTag] = csrf.TemplateField(req.Request)