diff --git a/TODO.md b/TODO.md
index 1004022..2750488 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,5 +1,2 @@
-- see if I can re-use a single set of logos/favicons... etc
-- new background image
-- new login theme
 - increase text size in logo
 - increase size of favicon? (remove "hair")?
diff --git a/docker-compose.yml b/docker-compose.yml
index b6f29f9..ab7a6b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
   keycloak:
     image: docker.io/bitnami/keycloak:18
     volumes:
+      - ./test:/test
       - ./themes:/opt/bitnami/keycloak/themes
     depends_on:
       - postgresql
diff --git a/licenses/background-image.png b/licenses/background-image.png
new file mode 100644
index 0000000..f766dcc
Binary files /dev/null and b/licenses/background-image.png differ
diff --git a/themes/mastermindzh.tech/admin/resources/img/favicon.ico b/themes/mastermindzh.tech/admin/resources/img/favicon.ico
deleted file mode 100644
index d4820e7..0000000
Binary files a/themes/mastermindzh.tech/admin/resources/img/favicon.ico and /dev/null differ
diff --git a/themes/mastermindzh.tech/admin/theme.properties b/themes/mastermindzh.tech/admin/theme.properties
index c1a677f..39f2cbe 100644
--- a/themes/mastermindzh.tech/admin/theme.properties
+++ b/themes/mastermindzh.tech/admin/theme.properties
@@ -1,5 +1,6 @@
 parent=base
 import=common/keycloak
+import=common/mastermindzh.tech
 
 styles=css/styles.css
 stylesCommon=node_modules/patternfly/dist/css/patternfly.min.css node_modules/patternfly/dist/css/patternfly-additions.min.css node_modules/select2/select2.css lib/angular/treeview/css/angular.treeview.css node_modules/text-security/text-security.css
diff --git a/themes/mastermindzh.tech/common/resources/img/bg.jpg b/themes/mastermindzh.tech/common/resources/img/bg.jpg
new file mode 100644
index 0000000..5999465
Binary files /dev/null and b/themes/mastermindzh.tech/common/resources/img/bg.jpg differ
diff --git a/themes/mastermindzh.tech/admin/resources/img/keycloak-logo.png b/themes/mastermindzh.tech/common/resources/img/keycloak-logo.png
similarity index 100%
rename from themes/mastermindzh.tech/admin/resources/img/keycloak-logo.png
rename to themes/mastermindzh.tech/common/resources/img/keycloak-logo.png
diff --git a/themes/mastermindzh.tech/login/resources/img/logo-white.png b/themes/mastermindzh.tech/common/resources/img/logo-white.png
similarity index 100%
rename from themes/mastermindzh.tech/login/resources/img/logo-white.png
rename to themes/mastermindzh.tech/common/resources/img/logo-white.png
diff --git a/themes/mastermindzh.tech/welcome/resources/logo.png b/themes/mastermindzh.tech/common/resources/img/logo.png
similarity index 100%
rename from themes/mastermindzh.tech/welcome/resources/logo.png
rename to themes/mastermindzh.tech/common/resources/img/logo.png
diff --git a/themes/mastermindzh.tech/login/resources/img/bg.jpg b/themes/mastermindzh.tech/login/resources/img/bg.jpg
deleted file mode 100644
index b15b50b..0000000
Binary files a/themes/mastermindzh.tech/login/resources/img/bg.jpg and /dev/null differ
diff --git a/themes/mastermindzh.tech/login/resources/img/favicon.ico b/themes/mastermindzh.tech/login/resources/img/favicon.ico
deleted file mode 100644
index d4820e7..0000000
Binary files a/themes/mastermindzh.tech/login/resources/img/favicon.ico and /dev/null differ
diff --git a/themes/mastermindzh.tech/login/theme.properties b/themes/mastermindzh.tech/login/theme.properties
index dc3c985..74c4e19 100644
--- a/themes/mastermindzh.tech/login/theme.properties
+++ b/themes/mastermindzh.tech/login/theme.properties
@@ -1,5 +1,6 @@
 parent=base
 import=common/keycloak
+import=common/mastermindzh.tech
 
 styles=css/login.css css/tile.css
 stylesCommon=web_modules/@fortawesome/fontawesome-free/css/icons/all.css web_modules/@patternfly/react-core/dist/styles/base.css web_modules/@patternfly/react-core/dist/styles/app.css node_modules/patternfly/dist/css/patternfly.min.css node_modules/patternfly/dist/css/patternfly-additions.min.css lib/pficon/pficon.css
diff --git a/themes/mastermindzh.tech/welcome/index.ftl b/themes/mastermindzh.tech/welcome/index.ftl
index d3533a9..7682ca4 100644
--- a/themes/mastermindzh.tech/welcome/index.ftl
+++ b/themes/mastermindzh.tech/welcome/index.ftl
@@ -26,11 +26,8 @@
       <div class="div-center">
          <div class="content">
             <div>
-            <img src ="${resourcesPath}/logo.png" alt = "logo" class="logo"/>
-            
-            
+               <img src ="${resourcesPath}/img/logo.png" alt = "logo" class="logo"/>
             </div>
-            
             <hr />
             <h3><a href="${adminUrl}"><img src="welcome-content/admin-console.png">Administration Console <i class="fa fa-angle-right link" aria-hidden="true"></i></a></h3>
             <div class="description">
diff --git a/themes/mastermindzh.tech/welcome/resources/bg.jpg b/themes/mastermindzh.tech/welcome/resources/bg.jpg
deleted file mode 100644
index b15b50b..0000000
Binary files a/themes/mastermindzh.tech/welcome/resources/bg.jpg and /dev/null differ
diff --git a/themes/mastermindzh.tech/welcome/resources/css/welcome.css b/themes/mastermindzh.tech/welcome/resources/css/welcome.css
index 0a8f9b2..22b7f27 100644
--- a/themes/mastermindzh.tech/welcome/resources/css/welcome.css
+++ b/themes/mastermindzh.tech/welcome/resources/css/welcome.css
@@ -1,5 +1,5 @@
 body {
-  background: #fff url(../bg.jpg) no-repeat center bottom fixed;
+  background: #fff url(../img/bg.jpg) no-repeat center bottom fixed;
   background-size: cover;
 }
 
diff --git a/themes/mastermindzh.tech/welcome/resources/img/favicon.ico b/themes/mastermindzh.tech/welcome/resources/img/favicon.ico
deleted file mode 100644
index d4820e7..0000000
Binary files a/themes/mastermindzh.tech/welcome/resources/img/favicon.ico and /dev/null differ
diff --git a/themes/mastermindzh.tech/welcome/theme.properties b/themes/mastermindzh.tech/welcome/theme.properties
index c8bc269..67b2b51 100644
--- a/themes/mastermindzh.tech/welcome/theme.properties
+++ b/themes/mastermindzh.tech/welcome/theme.properties
@@ -1,7 +1,7 @@
 styles=css/welcome.css
 import=common/keycloak
-
+import=common/mastermindzh.tech
 stylesCommon=node_modules/patternfly/dist/css/patternfly.css node_modules/patternfly/dist/css/patternfly-additions.css
 
 documentationUrl=https://www.keycloak.org/documentation.html
-displayCommunityLinks=true
\ No newline at end of file
+displayCommunityLinks=true