diff --git a/pdc-keycloak-theme/build.gradle.kts b/pdc-keycloak-theme/build.gradle.kts
index 3582a7c..534f7e0 100644
--- a/pdc-keycloak-theme/build.gradle.kts
+++ b/pdc-keycloak-theme/build.gradle.kts
@@ -43,7 +43,7 @@ tasks.register<Copy>("unpackSourceSansPro") {
         }
         includeEmptyDirs = false
     }
-    into(layout.buildDirectory.dir("resources/main/theme/pdc-keycloak-theme/login/resources/fonts"))
+    into(layout.buildDirectory.dir("resources/main/theme/pdc-keycloak-theme/common/resources/fonts"))
 }
 
 // Make sure that the font unpacking task runs before the jar task.
diff --git a/pdc-keycloak-theme/src/main/resources/META-INF/keycloak-themes.json b/pdc-keycloak-theme/src/main/resources/META-INF/keycloak-themes.json
index 874b76c..a07b7a2 100644
--- a/pdc-keycloak-theme/src/main/resources/META-INF/keycloak-themes.json
+++ b/pdc-keycloak-theme/src/main/resources/META-INF/keycloak-themes.json
@@ -1,6 +1,6 @@
 {
     "themes": [{
         "name" : "pdc-keycloak-theme",
-        "types": [ "login", "email" ]
+        "types": [ "account", "admin", "common", "email", "login" ]
     }]
 }
diff --git a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/account/theme.properties b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/account/theme.properties
new file mode 100644
index 0000000..68ca7ca
--- /dev/null
+++ b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/account/theme.properties
@@ -0,0 +1,3 @@
+parent=keycloak.v3
+import=common/pdc-keycloak-theme
+common=common/pdc-keycloak-theme
diff --git a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/admin/theme.properties b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/admin/theme.properties
new file mode 100644
index 0000000..14ba00b
--- /dev/null
+++ b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/admin/theme.properties
@@ -0,0 +1,3 @@
+parent=keycloak.v2
+import=common/pdc-keycloak-theme
+common=common/pdc-keycloak-theme
diff --git a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/login/resources/css/style.css b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/css/style.css
similarity index 73%
rename from pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/login/resources/css/style.css
rename to pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/css/style.css
index 991e503..2e37f98 100644
--- a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/login/resources/css/style.css
+++ b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/css/style.css
@@ -1,5 +1,36 @@
 :root {
+    --pdc-font-color: #151515;
+    --pdc-page-background-color: #EFEFEF;
+    --pdc-element-background-color: #FFFFFF;
+    --pdc-element-hover-background-color: #DDDDDD;
+    --pdc-element-hover-color: var(--pdc-font-color);
     --pf-global--spacer--form-element: 0.5rem;
+    --pf-v5-global--BackgroundColor: var(--pdc-page-background-color);
+    --pf-v5-c-button--m-plain--BackgroundColor: var(--pdc-element-background-color);
+    --pf-v5-c-nav__link--BackgroundColor: var(--pdc-element-background-color);
+    --pf-v5-c-page__header--BackgroundColor: var(--pdc-page-background-color);
+    --pf-v5-c-page__sidebar--BackgroundColor: var(--pdc-page-background-color);
+    --pf-v5-c-page--BackgroundColor: var(--pdc-page-background-color);
+    --pf-v5-global--BackgroundColor--dark-100: var(--pdc-page-background-color);
+    --pf-v5-global--Color: var(--pdc-font-color);
+    --pf-v5-global--Color--100: var(--pdc-font-color);
+    --pf-v5-global--Color--200: var(--pdc-font-color);
+    --pf-v5-global--Color--300: var(--pdc-font-color);
+    --pf-v5-global--Color--400: var(--pdc-font-color);
+    --pf-v5-global--Color--dark: var(--pdc-font-color);
+    --pf-v5-global--Color--dark-100: var(--pdc-font-color);
+    --pf-v5-global--Color--dark-200: var(--pdc-font-color);
+    --pf-v5-global--Color--dark-300: var(--pdc-font-color);
+    --pf-v5-global--Color--dark-400: var(--pdc-font-color);
+    --pf-v5-c-nav__section-title--Color: var(--pdc-font-color);
+    --pf-v5-c-nav__link--Color: var(--pdc-font-color);
+    --pf-v5-c-nav__link--BackgroundColor: var(--pdc-font-color);
+    --pf-v5-c-nav__link--m-current--BackgroundColor: var(--pdc-element-hover-background-color);
+    --pf-v5-c-nav--c-menu__list-item--hover--BackgroundColor: var(--pdc-element-hover-background-color);
+    --pf-v5-c-nav--c-menu__list-item--hover--Color: var(--pdc-element-hover-background-color);
+    --pf-v5-c-nav--m-horizontal-subnav__link--hover--BackgroundColor: var(--pdc-element-hover-background-color);
+    --pf-v5-c-nav--m-horizontal-subnav__link--hover--Color: var(--pdc-element-hover-color);
+    --pf-v5-c-menu-toggle--Color: var(--pdc-element-hover-background-color);
 }
 
 /* Begin: Original CSS copied from the following URL under the Apache License 2.0:
@@ -601,18 +632,18 @@ ul#kc-totp-supported-apps {
     background: none;
 }
 
-.login-pf body {
+.login-pf body, body, .pf-v5-c-modal-box__title {
     font-family: "Source Sans Pro", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
     background-image: none;
-    background-color: #EFEFEF;
+    background-color: var(--pdc-page-background-color);
 }
 
-.login-pf-page {
+.login-pf .login-pf-page, pf-v5-c-page, .login-pf-page {
     padding-top: 40px;
 }
 
-.login-pf-page #kc-header-wrapper {
-    background: transparent url('../img/pdc-logo.png') center center no-repeat;
+#kc-header-wrapper, .login-pf-page #kc-header-wrapper, header .pf-v5-c-masthead__brand {
+    background: transparent url('../img/keycloak-logo-text.png') center center no-repeat;
     background-size: contain;
     aspect-ratio: 500/119;
     max-width: 300px;
@@ -621,38 +652,42 @@ ul#kc-totp-supported-apps {
     text-indent: -9999px;
 }
 
-.login-pf-page .card-pf {
+header .pf-v5-c-masthead__brand img {
+    opacity: 0;
+}
+
+.pf-login .card-pf, .card-pf {
     border-top: none;
     border-radius: 5px;
     box-shadow: 0 0 3px rgba(0, 0, 0, 0.25);
     padding-top: 20px;
 }
 
-.login-pf-page .login-pf-header h1 {
+.pf-login h1, h1, .login-pf-page .login-pf-header h1 {
     font-weight: 600;
 }
 
-@media (min-width: 768px) {
-    .login-pf-page .login-pf-header h1 {
+.pf-login @media (min-width: 768px), .pf-login @media (min-width: 768px) {
+    h1 {
         font-size: 1.2rem;
     }
 }
 
-.login-pf-page .pf-c-button.pf-m-block {
+.pf-login .pf-c-button.pf-m-block, .pf-c-button.pf-m-block {
     display: inline-block;
     width: auto;
     padding: 10px 20px;
 }
 
-.login-pf-page .pf-c-form__label {
+.pf-login .pf-c-form__label, .pf-c-form__label {
     --pf-c-form__label--FontSize: 0.85rem;
 }
 
-.login-pf-page .pf-c-form__label-text {
+.pf-login .pf-c-form__label-text, .pf-c-form__label-text {
     --pf-c-form__label-text--FontWeight: 400;
 }
 
-.login-pf-page .pf-c-form-control {
+.pf-login .pf-c-form-control, .pf-c-form-control {
     --pf-c-form-control--BorderRadius: 5px;
     --pf-c-form-control--BorderBottomColor: var(--pf-global--BorderColor--300);
     --pf-c-form-control--hover--BorderBottomColor: var(--pf-global--BorderColor--300);
@@ -660,17 +695,49 @@ ul#kc-totp-supported-apps {
     --pf-c-form-control--focus--BorderBottomWidth: var(--pf-global--BorderWidth--sm);
 }
 
-.login-pf-page .pf-c-form-control:focus {
+.pf-login .pf-c-form-control:focus, .pf-c-form-control:focus {
     --pf-c-form-control--focus--BorderBottomWidth: var(--pf-global--BorderWidth--sm);
 }
 
-.login-pf-page .pf-c-button {
+.pf-login .pf-c-button, .pf-c-button {
     --pf-c-button--BorderRadius: 5px;
     --pf-c-button--m-primary--BackgroundColor: #1176BC;
     --pf-c-button--FontWeight: 600;
 }
 
-.login-pf-page .btn-lg {
+.btn-lg, .pf-login .btn-lg {
     border-radius: 5px;
     padding: 10px;
 }
+
+
+body, .pf-login body, .keycloak__loading-container {
+    color: var(--pdc-font-color);
+    background-color: var(--pdc-page-background-color);
+}
+
+
+.pf-v5-c-tabs__item-text, .pf-v5-c-nav__link.pf-m-current, h1, h2, h3, h4, h5, h6, h7, section, sidebar, nav, span, ul, ol, li, a, th, td, header, footer, main, .pf-v5-c-nav__link, #account, .pf-v5-c-nav__toggle, span .pf-v5-c-nav__toggle {
+    color: var(--pdc-font-color);
+    background-color: var(--pdc-page-element-background-color);
+}
+
+html body div div.pf-v5-c-page.pf-m-resize-observer.pf-m-breakpoint-xl.pf-m-height-breakpoint-2xl div .pf-v5-c-page__sidebar.pf-m-expanded div.pf-v5-c-page__sidebar-body nav.pf-v5-c-nav ul.pf-v5-c-nav__list li.pf-v5-c-nav__item.pf-m-expandable button .pf-v5-c-nav__link {
+    color: var(--pdc-font-color);
+    background-color: var(--pdc-page-element-background-color);
+}
+
+html body div div div nav ul li a .pf-v5-c-nav__link {
+    color: var(--pdc-font-color);
+    background-color: var(--pdc-background-color);
+}
+
+div.pf-v5-c-page__sidebar-body nav.pf-v5-c-nav ul.pf-v5-c-nav__list li.pf-v5-c-nav__item a.pf-v5-c-nav__link {
+    background-color: var(--pdc-background-color);
+    color: var(--pdc-font-color);
+}
+
+div div__sidebar-body nav.pf-v5-c-nav ul.pf-v5-c-nav__list li.pf-v5-c-nav__item.pf-m-expandable button.pf-v5-c-nav__link {
+    background-color: var(--pdc-background-color);
+    color: var(--pdc-font-color);
+}
diff --git a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/icon.svg b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/icon.svg
new file mode 100644
index 0000000..dd9bff1
--- /dev/null
+++ b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/icon.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210.32031mm"
+   height="223.33397mm"
+   viewBox="0 0 210.32031 223.33397"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   sodipodi:docname="icon.svg"
+   xml:space="preserve"
+   inkscape:export-filename="PDC-Logo_pathed.png"
+   inkscape:export-xdpi="350"
+   inkscape:export-ydpi="350"><metadata
+     id="metadata40"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.41424662"
+     inkscape:cx="773.19905"
+     inkscape:cy="538.32666"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" /><defs
+     id="defs2"><inkscape:path-effect
+       effect="spiro"
+       id="path-effect558"
+       is_visible="true"
+       lpeversion="1" /><inkscape:path-effect
+       effect="spiro"
+       id="path-effect1165"
+       is_visible="true"
+       lpeversion="1" /><inkscape:path-effect
+       effect="spiro"
+       id="path-effect1161"
+       is_visible="true"
+       lpeversion="1" /><inkscape:path-effect
+       effect="spiro"
+       id="path-effect1143"
+       is_visible="true"
+       lpeversion="1" /><inkscape:path-effect
+       effect="spiro"
+       id="path-effect1126"
+       is_visible="true"
+       lpeversion="1" /><inkscape:path-effect
+       effect="spiro"
+       id="path-effect1026"
+       is_visible="true"
+       lpeversion="1" /></defs><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(405.24683,56.426945)"><path
+       id="path1124"
+       style="fill:#f58320;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -276.58638,42.812571 c 0,0 47.81558,-28.233706 63.18882,-37.2524837 2.61796,56.7836827 -22.15716,110.7135727 -63.06906,133.3383727 0,-18.08179 -0.11976,-96.085889 -0.11976,-96.085889 z m -16.97656,-11.33987 c 0,0 0.11291,108.966459 0.11291,135.434329 34.74441,-7.92188 70.80791,-48.66529 85.00394,-85.430395 17.1188,-44.334531 15.02559,-83.4448557 9.70246,-96.946321 -1.12855,-2.862426 -4.32363,-5.989438 -9.0796,-3.243573 -21.10065,12.1824638 -85.73971,50.18596 -85.73971,50.18596 z"
+       sodipodi:nodetypes="ccccccsssc" /><path
+       id="path1163"
+       style="fill:#343433;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -387.33385,5.5036332 c -1.24763,13.3345208 0.87825,31.5882698 3.66954,40.8730548 l 59.57361,35.792149 v -39.65566 z m 80.1892,142.3367568 c 0,7.52266 0,11.25425 0,19.06664 -63.81401,-19.52797 -98.10181,-93.76878 -98.10181,-150.800507 0,-12.7180257 -0.27297,-42.351455 14.00201,-34.107664 28.76256,16.6060752 84.11976,49.476617 84.11976,49.476617 l -0.0399,79.539314 c 0,0 -38.57186,-21.504718 -70.3978,-39.879435 5.7033,24.453032 34.98912,60.010345 70.41774,76.705035 z"
+       sodipodi:nodetypes="cccccccsccccc" /><path
+       style="fill:#1176bc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -326.363,-56.426945 0.56455,16.71053 -28.45307,17.444439 55.07079,33.308743 54.45,-33.452421 -30.49839,-17.085484 -0.0143,-16.841125 60.09578,33.251697 -84.25833,48.720229 -86.00843,-50.498545 z"
+       id="path556" /></g></svg>
diff --git a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/img/bg-login.jpg b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/img/bg-login.jpg
new file mode 100644
index 0000000..2097147
Binary files /dev/null and b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/img/bg-login.jpg differ
diff --git a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/img/keycloak-logo-text.png b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/img/keycloak-logo-text.png
new file mode 100644
index 0000000..3fc2561
Binary files /dev/null and b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/img/keycloak-logo-text.png differ
diff --git a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/img/keycloak-logo.png b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/img/keycloak-logo.png
new file mode 100644
index 0000000..4af6f86
Binary files /dev/null and b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/img/keycloak-logo.png differ
diff --git a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/img/pdc-logo.png b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/img/pdc-logo.png
new file mode 100644
index 0000000..3fc2561
Binary files /dev/null and b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/img/pdc-logo.png differ
diff --git a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/logo.svg b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/logo.svg
new file mode 100644
index 0000000..013e329
--- /dev/null
+++ b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/logo.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="938.95337mm"
+   height="223.35066mm"
+   viewBox="0 0 938.95337 223.35066"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   sodipodi:docname="PDC-Logo_pathed.svg"
+   xml:space="preserve"
+   inkscape:export-filename="PDC-Logo_pathed.png"
+   inkscape:export-xdpi="350"
+   inkscape:export-ydpi="350"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.41424662"
+     inkscape:cx="574.53698"
+     inkscape:cy="538.32666"
+     inkscape:window-width="1918"
+     inkscape:window-height="1034"
+     inkscape:window-x="0"
+     inkscape:window-y="15"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1" /><defs
+     id="defs2"><inkscape:path-effect
+       effect="spiro"
+       id="path-effect558"
+       is_visible="true"
+       lpeversion="1" /><inkscape:path-effect
+       effect="spiro"
+       id="path-effect1165"
+       is_visible="true"
+       lpeversion="1" /><inkscape:path-effect
+       effect="spiro"
+       id="path-effect1161"
+       is_visible="true"
+       lpeversion="1" /><inkscape:path-effect
+       effect="spiro"
+       id="path-effect1143"
+       is_visible="true"
+       lpeversion="1" /><inkscape:path-effect
+       effect="spiro"
+       id="path-effect1126"
+       is_visible="true"
+       lpeversion="1" /><inkscape:path-effect
+       effect="spiro"
+       id="path-effect1026"
+       is_visible="true"
+       lpeversion="1" /></defs><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(405.28638,56.426945)"><g
+       aria-label="PHILANTHROPY"
+       transform="scale(0.99682362,1.0031865)"
+       id="text288"
+       style="font-size:78.1993px;line-height:0%;font-family:'Gotham Black';-inkscape-font-specification:'Gotham Black, ';letter-spacing:4.79261px;word-spacing:0px;fill:#343433;stroke-width:0.264584px"><path
+         d="m -162.48247,50.793415 h 15.17067 v -15.63986 h 7.50713 c 13.60668,0 23.53799,-6.80334 23.53799,-19.706225 v -0.156398 c 0,-12.1208923 -8.91472,-19.2370288 -22.756,-19.2370288 h -23.45979 z M -147.3118,23.267261 V 8.8003895 h 7.11613 c 5.47395,0 8.75832,2.5023775 8.75832,7.1943355 v 0.156399 c 0,4.300962 -3.28437,7.116137 -8.68012,7.116137 z"
+         id="path1173" /><path
+         d="m -105.0617,50.793415 h 15.170664 V 29.992401 h 19.471627 v 20.801014 h 15.170665 V -3.9460968 H -70.419409 V 16.54212 H -89.891036 V -3.9460968 H -105.0617 Z"
+         id="path1175" /><path
+         d="m -40.446649,50.793415 h 15.248864 V -3.9460968 h -15.248864 z"
+         id="path1177" /><path
+         d="M -10.395692,50.793415 H 31.284536 V 37.499534 H 4.7749724 V -3.9460968 H -10.395692 Z"
+         id="path1179" /><path
+         d="m 38.188465,50.793415 h 15.952657 l 3.909965,-9.774913 h 21.113812 l 3.988165,9.774913 H 99.418519 L 76.115126,-4.3370933 H 61.491857 Z m 24.319983,-21.583007 6.177745,-15.561662 6.099545,15.561662 z"
+         id="path1181" /><path
+         d="m 109.5287,50.793415 h 15.01427 V 20.764883 l 23.38159,30.028532 h 13.29388 V -3.9460968 H 146.20417 V 24.987645 L 123.68277,-3.9460968 H 109.5287 Z"
+         id="path1183" /><path
+         d="m 189.07983,50.793415 h 15.17066 V 9.3477847 h 16.42186 V -3.9460968 H 172.65797 V 9.3477847 h 16.42186 z"
+         id="path1185" /><path
+         d="m 232.11189,50.793415 h 15.17067 V 29.992401 h 19.47162 v 20.801014 h 15.17067 V -3.9460968 H 266.75418 V 16.54212 H 247.28256 V -3.9460968 h -15.17067 z"
+         id="path1187" /><path
+         d="M 296.41414,50.793415 H 311.5848 V 34.215163 h 6.49054 0.1564 l 11.0261,16.578252 h 17.51665 L 333.7152,31.712785 c 6.80334,-2.893374 11.2607,-8.445524 11.2607,-16.81285 v -0.156398 c 0,-5.3957523 -1.64218,-9.6185147 -4.84835,-12.7464868 -3.67537,-3.7535665 -9.46212,-5.943147 -17.82944,-5.943147 H 296.41414 Z M 311.5848,22.328869 V 9.191386 h 9.93131 c 5.08296,0 8.21093,2.189581 8.21093,6.490542 v 0.156399 c 0,3.988164 -2.97157,6.490542 -8.13273,6.490542 z"
+         id="path1189" /><path
+         d="m 384.95818,51.888205 c 16.89104,0 29.55933,-12.746486 29.55933,-28.464546 v -0.156398 c 0,-15.7180603 -12.51189,-28.308148 -29.40294,-28.308148 -16.89105,0 -29.55933,12.7464863 -29.55933,28.464546 v 0.156399 c 0,15.71806 12.51189,28.308147 29.40294,28.308147 z m 0.15639,-13.684878 c -8.28912,0 -13.99767,-6.881538 -13.99767,-14.779668 v -0.156398 c 0,-7.89813 5.55215,-14.6232701 13.84128,-14.6232701 8.36732,0 14.07587,6.8815391 14.07587,14.7796681 v 0.156399 c 0,7.898129 -5.55215,14.623269 -13.91948,14.623269 z"
+         id="path1191" /><path
+         d="m 427.2082,50.793415 h 15.17067 v -15.63986 h 7.50713 c 13.60668,0 23.53799,-6.80334 23.53799,-19.706225 v -0.156398 c 0,-12.1208923 -8.91472,-19.2370288 -22.75599,-19.2370288 H 427.2082 Z M 442.37887,23.267261 V 8.8003895 h 7.11614 c 5.47395,0 8.75832,2.5023775 8.75832,7.1943355 v 0.156399 c 0,4.300962 -3.28437,7.116137 -8.68012,7.116137 z"
+         id="path1193" /><path
+         d="M 499.09583,50.793415 H 514.3447 V 30.0706 l 20.80101,-34.0166968 h -16.96925 l -11.3389,19.9408218 -11.2607,-19.9408218 h -17.28204 l 20.80101,34.2512948 z"
+         id="path1195" /></g><g
+       aria-label="DATA COMMONS"
+       transform="scale(0.97253411,1.0282416)"
+       id="text950"
+       style="font-size:51.4264px;line-height:0%;font-family:'Gotham Black';-inkscape-font-specification:'Gotham Black, ';letter-spacing:6.04044px;word-spacing:0px;fill:#1176bc;stroke-width:0.264583px"><path
+         d="m -169.07871,110.92973 h 13.67942 c 12.95945,0 20.51913,-7.71396 20.51913,-18.102089 v -0.102853 c 0,-10.388133 -7.45683,-17.793534 -20.31343,-17.793534 h -13.88512 z m 9.97672,-8.84534 V 83.776594 h 4.06268 c 5.96547,0 9.9253,3.342716 9.9253,9.102473 v 0.102853 c 0,5.811183 -3.95983,9.10247 -9.9253,9.10247 z"
+         id="path1149" /><path
+         d="m -129.14827,110.92973 h 10.49098 l 2.57132,-6.4283 h 13.88513 l 2.622745,6.4283 h 10.696691 L -104.20647,74.674122 h -9.61674 z m 15.99361,-14.193683 4.06268,-10.233853 4.01126,10.233853 z"
+         id="path1151" /><path
+         d="m -75.178438,110.92973 h 9.976721 V 83.673742 h 10.799544 v -8.742488 h -31.575809 v 8.742488 h 10.799544 z"
+         id="path1153" /><path
+         d="m -51.498761,110.92973 h 10.490985 l 2.57132,-6.4283 h 13.885128 l 2.622746,6.4283 h 10.696691 L -26.556958,74.674122 h -9.616736 z m 15.99361,-14.193683 4.062685,-10.233853 4.01126,10.233853 z"
+         id="path1155" /><path
+         d="m 35.921813,111.6497 c 7.971092,0 12.548041,-3.44557 15.942183,-8.12537 l -7.508254,-5.348344 c -2.159909,2.622744 -4.371244,4.371244 -8.125371,4.371244 -5.039787,0 -8.588209,-4.216965 -8.588209,-9.616736 v -0.102853 c 0,-5.245493 3.548422,-9.513884 8.588209,-9.513884 3.445569,0 5.811183,1.645645 7.868239,4.216965 l 7.508255,-5.811183 c -3.188437,-4.422671 -7.919666,-7.508255 -15.273641,-7.508255 -10.902397,0 -18.976341,8.228224 -18.976341,18.71921 v 0.102852 c 0,10.748114 8.27965,18.616354 18.56493,18.616354 z"
+         id="path1157" /><path
+         d="m 79.24634,111.6497 c 11.108102,0 19.439179,-8.3825 19.439179,-18.719206 v -0.102853 c 0,-10.336706 -8.228224,-18.616357 -19.336326,-18.616357 -11.108103,0 -19.439179,8.382503 -19.439179,18.71921 v 0.102852 c 0,10.336704 8.228224,18.616354 19.336326,18.616354 z m 0.102853,-8.99962 c -5.451199,0 -9.205326,-4.52552 -9.205326,-9.719586 v -0.102853 c 0,-5.194067 3.651275,-9.616737 9.102473,-9.616737 5.502625,0 9.256752,4.525523 9.256752,9.71959 v 0.102852 c 0,5.194067 -3.651275,9.616734 -9.153899,9.616734 z"
+         id="path1159" /><path
+         d="m 109.92,110.92973 h 9.77102 V 90.359174 l 9.1539,13.987976 h 0.2057 l 9.20533,-14.090829 v 20.673409 h 9.9253 V 74.931254 h -10.54242 l -8.58821,13.936554 -8.5882,-13.936554 H 109.92 Z"
+         id="path1161" /><path
+         d="m 160.59853,110.92973 h 9.77102 V 90.359174 l 9.1539,13.987976 h 0.2057 l 9.20533,-14.090829 v 20.673409 h 9.92529 V 74.931254 h -10.54241 l -8.58821,13.936554 -8.58821,-13.936554 h -10.54241 z"
+         id="path1164" /><path
+         d="m 229.37918,111.6497 c 11.10811,0 19.43918,-8.3825 19.43918,-18.719206 v -0.102853 c 0,-10.336706 -8.22822,-18.616357 -19.33632,-18.616357 -11.10811,0 -19.43918,8.382503 -19.43918,18.71921 v 0.102852 c 0,10.336704 8.22822,18.616354 19.33632,18.616354 z m 0.10286,-8.99962 c -5.4512,0 -9.20533,-4.52552 -9.20533,-9.719586 v -0.102853 c 0,-5.194067 3.65127,-9.616737 9.10247,-9.616737 5.50263,0 9.25675,4.525523 9.25675,9.71959 v 0.102852 c 0,5.194067 -3.65127,9.616734 -9.15389,9.616734 z"
+         id="path1166" /><path
+         d="m 260.05285,110.92973 h 9.87387 V 91.181996 l 15.37649,19.747734 h 8.74249 V 74.931254 h -9.87387 v 19.027768 l -14.8108,-19.027768 h -9.30818 z"
+         id="path1168" /><path
+         d="m 320.60526,111.54685 c 8.74249,0 14.55367,-4.37124 14.55367,-11.725219 v -0.102853 c 0,-6.736858 -5.14264,-9.411031 -13.42229,-11.210955 -4.98836,-1.131381 -6.22259,-1.85135 -6.22259,-3.496995 v -0.102853 c 0,-1.28566 1.18281,-2.314188 3.59985,-2.314188 3.18843,0 6.78828,1.234234 10.07957,3.548422 l 4.98836,-7.045417 c -3.9084,-3.13701 -8.69106,-4.782655 -14.8108,-4.782655 -8.63964,0 -13.93655,4.834082 -13.93655,11.519513 v 0.102853 c 0,7.405402 5.91403,9.565311 13.57656,11.313808 4.88551,1.131381 6.06832,1.954203 6.06832,3.445569 v 0.10285 c 0,1.54279 -1.43994,2.46847 -4.11411,2.46847 -4.16554,0 -8.12537,-1.49137 -11.67379,-4.319818 l -5.55406,6.634008 c 4.42267,3.95983 10.49099,5.96546 16.86786,5.96546 z"
+         id="path1170" /></g><path
+       id="path1124"
+       style="fill:#f58320;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -276.58638,42.812571 c 0,0 47.81558,-28.233706 63.18882,-37.2524837 2.61796,56.7836827 -22.15716,110.7135727 -63.06906,133.3383727 0,-18.08179 -0.11976,-96.085889 -0.11976,-96.085889 z m -16.97656,-11.33987 c 0,0 0.11291,108.966459 0.11291,135.434329 34.74441,-7.92188 70.80791,-48.66529 85.00394,-85.430395 17.1188,-44.334531 15.02559,-83.4448557 9.70246,-96.946321 -1.12855,-2.862426 -4.32363,-5.989438 -9.0796,-3.243573 -21.10065,12.1824638 -85.73971,50.18596 -85.73971,50.18596 z"
+       sodipodi:nodetypes="ccccccsssc" /><path
+       id="path1163"
+       style="fill:#343433;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -387.33385,5.5036332 c -1.24763,13.3345208 0.87825,31.5882698 3.66954,40.8730548 l 59.57361,35.792149 v -39.65566 z m 80.1892,142.3367568 c 0,7.52266 0,11.25425 0,19.06664 -63.81401,-19.52797 -98.10181,-93.76878 -98.10181,-150.800507 0,-12.7180257 -0.27297,-42.351455 14.00201,-34.107664 28.76256,16.6060752 84.11976,49.476617 84.11976,49.476617 l -0.0399,79.539314 c 0,0 -38.57186,-21.504718 -70.3978,-39.879435 5.7033,24.453032 34.98912,60.010345 70.41774,76.705035 z"
+       sodipodi:nodetypes="cccccccsccccc" /><path
+       style="fill:#1176bc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -326.363,-56.426945 0.56455,16.71053 -28.45307,17.444439 55.07079,33.308743 54.45,-33.452421 -30.49839,-17.085484 -0.0143,-16.841125 60.09578,33.251697 -84.25833,48.720229 -86.00843,-50.498545 z"
+       id="path556" /></g></svg>
diff --git a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/vendor/patternfly-v3/img/bg-login.jpg b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/vendor/patternfly-v3/img/bg-login.jpg
new file mode 100644
index 0000000..31120eb
Binary files /dev/null and b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/resources/vendor/patternfly-v3/img/bg-login.jpg differ
diff --git a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/theme.properties b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/theme.properties
new file mode 100644
index 0000000..ccdee21
--- /dev/null
+++ b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/common/theme.properties
@@ -0,0 +1,3 @@
+parent=keycloak
+import=common/keycloak
+styles=fonts/source-sans-pro/400.css fonts/source-sans-pro/600.css fonts/source-sans-pro/700.css css/style.css
\ No newline at end of file
diff --git a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/login/theme.properties b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/login/theme.properties
index ccdee21..ed02f1b 100644
--- a/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/login/theme.properties
+++ b/pdc-keycloak-theme/src/main/resources/theme/pdc-keycloak-theme/login/theme.properties
@@ -1,3 +1,3 @@
 parent=keycloak
-import=common/keycloak
-styles=fonts/source-sans-pro/400.css fonts/source-sans-pro/600.css fonts/source-sans-pro/700.css css/style.css
\ No newline at end of file
+import=common/pdc-keycloak-theme
+common=common/pdc-keycloak-theme