diff --git a/src/main/resources/cas-theme-default.properties b/src/main/resources/cas-theme-default.properties
new file mode 100644
index 00000000..9b5fabf7
--- /dev/null
+++ b/src/main/resources/cas-theme-default.properties
@@ -0,0 +1,4 @@
+# Use customized CSS file. For documentation, refer to Apereo CAS 6.2.8 documentation:
+# https://github.com/apereo/cas/blob/v6.2.8/docs/cas-server-documentation/ux/User-Interface-Customization-CSSJS.md
+cas.standard.css.file=/css/cas-redesigned.css
+cas.standard.js.file=/js/cas.js
diff --git a/src/main/resources/static/css/cas.css b/src/main/resources/static/css/cas-redesigned.css
similarity index 100%
rename from src/main/resources/static/css/cas.css
rename to src/main/resources/static/css/cas-redesigned.css
diff --git a/src/main/resources/templates/casAccountDisabledView.html b/src/main/resources/templates/casAccountDisabledView.html
index 29b1277b..ae3e1320 100644
--- a/src/main/resources/templates/casAccountDisabledView.html
+++ b/src/main/resources/templates/casAccountDisabledView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casAccountNotConfirmedIdPView.html b/src/main/resources/templates/casAccountNotConfirmedIdPView.html
index a042d00e..c9156b8b 100644
--- a/src/main/resources/templates/casAccountNotConfirmedIdPView.html
+++ b/src/main/resources/templates/casAccountNotConfirmedIdPView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casAccountNotConfirmedOsfView.html b/src/main/resources/templates/casAccountNotConfirmedOsfView.html
index 532d8448..f9564799 100644
--- a/src/main/resources/templates/casAccountNotConfirmedOsfView.html
+++ b/src/main/resources/templates/casAccountNotConfirmedOsfView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casGenericSuccessView.html b/src/main/resources/templates/casGenericSuccessView.html
index cba49b15..59074d4b 100644
--- a/src/main/resources/templates/casGenericSuccessView.html
+++ b/src/main/resources/templates/casGenericSuccessView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casInstitutionLoginView.html b/src/main/resources/templates/casInstitutionLoginView.html
index e09fd549..bdf9f08e 100644
--- a/src/main/resources/templates/casInstitutionLoginView.html
+++ b/src/main/resources/templates/casInstitutionLoginView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casInstitutionSsoAccountInactiveView.html b/src/main/resources/templates/casInstitutionSsoAccountInactiveView.html
index 90858df3..f5f72787 100644
--- a/src/main/resources/templates/casInstitutionSsoAccountInactiveView.html
+++ b/src/main/resources/templates/casInstitutionSsoAccountInactiveView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casInstitutionSsoAttributeMissingView.html b/src/main/resources/templates/casInstitutionSsoAttributeMissingView.html
index d149f26e..406f903c 100644
--- a/src/main/resources/templates/casInstitutionSsoAttributeMissingView.html
+++ b/src/main/resources/templates/casInstitutionSsoAttributeMissingView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casInstitutionSsoAttributeParsingFailedView.html b/src/main/resources/templates/casInstitutionSsoAttributeParsingFailedView.html
index 7e849613..8b194847 100644
--- a/src/main/resources/templates/casInstitutionSsoAttributeParsingFailedView.html
+++ b/src/main/resources/templates/casInstitutionSsoAttributeParsingFailedView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casInstitutionSsoDuplicateIdentityView.html b/src/main/resources/templates/casInstitutionSsoDuplicateIdentityView.html
index d76b1c24..54591793 100644
--- a/src/main/resources/templates/casInstitutionSsoDuplicateIdentityView.html
+++ b/src/main/resources/templates/casInstitutionSsoDuplicateIdentityView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casInstitutionSsoFailedView.html b/src/main/resources/templates/casInstitutionSsoFailedView.html
index b4d63ad1..fde8bf12 100644
--- a/src/main/resources/templates/casInstitutionSsoFailedView.html
+++ b/src/main/resources/templates/casInstitutionSsoFailedView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casInstitutionSsoMultipleEmailsNotSupportedView.html b/src/main/resources/templates/casInstitutionSsoMultipleEmailsNotSupportedView.html
index af37711e..5e240737 100644
--- a/src/main/resources/templates/casInstitutionSsoMultipleEmailsNotSupportedView.html
+++ b/src/main/resources/templates/casInstitutionSsoMultipleEmailsNotSupportedView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casInstitutionSsoOsfApiFailedView.html b/src/main/resources/templates/casInstitutionSsoOsfApiFailedView.html
index 48e4f07c..feb64bbe 100644
--- a/src/main/resources/templates/casInstitutionSsoOsfApiFailedView.html
+++ b/src/main/resources/templates/casInstitutionSsoOsfApiFailedView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casInstitutionSsoSelectiveLoginDeniedView.html b/src/main/resources/templates/casInstitutionSsoSelectiveLoginDeniedView.html
index 58bb897c..d9646a63 100644
--- a/src/main/resources/templates/casInstitutionSsoSelectiveLoginDeniedView.html
+++ b/src/main/resources/templates/casInstitutionSsoSelectiveLoginDeniedView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casInvalidUserStatusView.html b/src/main/resources/templates/casInvalidUserStatusView.html
index d3d60d31..0e0118de 100644
--- a/src/main/resources/templates/casInvalidUserStatusView.html
+++ b/src/main/resources/templates/casInvalidUserStatusView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casInvalidVerificationKeyView.html b/src/main/resources/templates/casInvalidVerificationKeyView.html
index 314a0d3a..da287092 100644
--- a/src/main/resources/templates/casInvalidVerificationKeyView.html
+++ b/src/main/resources/templates/casInvalidVerificationKeyView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casLoginView.html b/src/main/resources/templates/casLoginView.html
index 82501239..5ebb203e 100644
--- a/src/main/resources/templates/casLoginView.html
+++ b/src/main/resources/templates/casLoginView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casLogoutView.html b/src/main/resources/templates/casLogoutView.html
index d52a5784..6348a179 100644
--- a/src/main/resources/templates/casLogoutView.html
+++ b/src/main/resources/templates/casLogoutView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casOAuth20ErrorView.html b/src/main/resources/templates/casOAuth20ErrorView.html
index c71cb1e4..91cdd8b4 100644
--- a/src/main/resources/templates/casOAuth20ErrorView.html
+++ b/src/main/resources/templates/casOAuth20ErrorView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casPac4jStopWebflow.html b/src/main/resources/templates/casPac4jStopWebflow.html
index 58a4fc5d..4e864c66 100644
--- a/src/main/resources/templates/casPac4jStopWebflow.html
+++ b/src/main/resources/templates/casPac4jStopWebflow.html
@@ -6,7 +6,7 @@
Pac4j Stop Webflow View
-
+
diff --git a/src/main/resources/templates/casServiceErrorView.html b/src/main/resources/templates/casServiceErrorView.html
index 5d4dcf64..539190db 100644
--- a/src/main/resources/templates/casServiceErrorView.html
+++ b/src/main/resources/templates/casServiceErrorView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casTermsOfServiceConsentView.html b/src/main/resources/templates/casTermsOfServiceConsentView.html
index 4fb66e22..ab7898cb 100644
--- a/src/main/resources/templates/casTermsOfServiceConsentView.html
+++ b/src/main/resources/templates/casTermsOfServiceConsentView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casTwoFactorLoginView.html b/src/main/resources/templates/casTwoFactorLoginView.html
index c559d272..11754f39 100644
--- a/src/main/resources/templates/casTwoFactorLoginView.html
+++ b/src/main/resources/templates/casTwoFactorLoginView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/casUnsupportedInstitutionLoginView.html b/src/main/resources/templates/casUnsupportedInstitutionLoginView.html
index 43033090..2afe3646 100644
--- a/src/main/resources/templates/casUnsupportedInstitutionLoginView.html
+++ b/src/main/resources/templates/casUnsupportedInstitutionLoginView.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
index d81fa8aa..9e5a2e85 100644
--- a/src/main/resources/templates/error.html
+++ b/src/main/resources/templates/error.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/error/401.html b/src/main/resources/templates/error/401.html
index c747a92d..4b2ce5f5 100644
--- a/src/main/resources/templates/error/401.html
+++ b/src/main/resources/templates/error/401.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/error/403.html b/src/main/resources/templates/error/403.html
index f519cb60..59d6af0d 100644
--- a/src/main/resources/templates/error/403.html
+++ b/src/main/resources/templates/error/403.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/error/404.html b/src/main/resources/templates/error/404.html
index bd4fa97e..30518661 100644
--- a/src/main/resources/templates/error/404.html
+++ b/src/main/resources/templates/error/404.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/error/405.html b/src/main/resources/templates/error/405.html
index 5974685f..382082ba 100644
--- a/src/main/resources/templates/error/405.html
+++ b/src/main/resources/templates/error/405.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/error/423.html b/src/main/resources/templates/error/423.html
index 2a3cb724..64b38e7f 100644
--- a/src/main/resources/templates/error/423.html
+++ b/src/main/resources/templates/error/423.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html
index 65dea21f..771b8b7f 100644
--- a/src/main/resources/templates/fragments/header.html
+++ b/src/main/resources/templates/fragments/header.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/fragments/headerosf.html b/src/main/resources/templates/fragments/headerosf.html
index aa6cbaa9..7f397b0a 100644
--- a/src/main/resources/templates/fragments/headerosf.html
+++ b/src/main/resources/templates/fragments/headerosf.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/fragments/leftpane.html b/src/main/resources/templates/fragments/leftpane.html
index 0379c110..75252303 100644
--- a/src/main/resources/templates/fragments/leftpane.html
+++ b/src/main/resources/templates/fragments/leftpane.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/fragments/leftpaneosf.html b/src/main/resources/templates/fragments/leftpaneosf.html
index e41702b4..07424a69 100644
--- a/src/main/resources/templates/fragments/leftpaneosf.html
+++ b/src/main/resources/templates/fragments/leftpaneosf.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/main/resources/templates/fragments/loginform.html b/src/main/resources/templates/fragments/loginform.html
index 43ef50f2..b03bdfbf 100644
--- a/src/main/resources/templates/fragments/loginform.html
+++ b/src/main/resources/templates/fragments/loginform.html
@@ -7,7 +7,7 @@
-
+
diff --git a/src/main/resources/templates/fragments/submitbutton.html b/src/main/resources/templates/fragments/submitbutton.html
index ceda5caa..514e2fdc 100644
--- a/src/main/resources/templates/fragments/submitbutton.html
+++ b/src/main/resources/templates/fragments/submitbutton.html
@@ -7,7 +7,7 @@
Service UI Fragment
-
+
diff --git a/src/main/resources/templates/fragments/tosloginform.html b/src/main/resources/templates/fragments/tosloginform.html
index 4bf261ce..11732f29 100644
--- a/src/main/resources/templates/fragments/tosloginform.html
+++ b/src/main/resources/templates/fragments/tosloginform.html
@@ -7,7 +7,7 @@
-
+
diff --git a/src/main/resources/templates/fragments/totploginform.html b/src/main/resources/templates/fragments/totploginform.html
index 80865261..babf76e9 100644
--- a/src/main/resources/templates/fragments/totploginform.html
+++ b/src/main/resources/templates/fragments/totploginform.html
@@ -7,7 +7,7 @@
-
+
diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html
index 6a2d3ab9..db1c5ad8 100644
--- a/src/main/resources/templates/layout.html
+++ b/src/main/resources/templates/layout.html
@@ -13,7 +13,7 @@
-
+
diff --git a/src/main/resources/templates/layoutosf.html b/src/main/resources/templates/layoutosf.html
index 4039726a..6a62c150 100644
--- a/src/main/resources/templates/layoutosf.html
+++ b/src/main/resources/templates/layoutosf.html
@@ -13,7 +13,7 @@
-
+
diff --git a/src/main/resources/templates/protocol/oauth/confirm.html b/src/main/resources/templates/protocol/oauth/confirm.html
index 744f4cbe..08b36217 100644
--- a/src/main/resources/templates/protocol/oauth/confirm.html
+++ b/src/main/resources/templates/protocol/oauth/confirm.html
@@ -6,7 +6,7 @@
-
+