diff --git a/distribution/feature-packs/server-feature-pack/assembly.xml b/distribution/feature-packs/server-feature-pack/assembly.xml
index 36ee4fa755..41ef1737eb 100644
--- a/distribution/feature-packs/server-feature-pack/assembly.xml
+++ b/distribution/feature-packs/server-feature-pack/assembly.xml
@@ -53,7 +53,7 @@
         </fileSet>
         <fileSet>
             <directory>../../../themes/src/main/resources/theme</directory>
-            <outputDirectory>content/standalone/configuration/themes</outputDirectory>
+            <outputDirectory>content/themes</outputDirectory>
             <includes>
                 <include>**/**</include>
             </includes>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/providers/README.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/content/providers/README.txt
similarity index 100%
rename from distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/providers/README.txt
rename to distribution/feature-packs/server-feature-pack/src/main/resources/content/providers/README.txt
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/keycloak-server.json b/distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/keycloak-server.json
index 407f0c003a..ff5bb853e2 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/keycloak-server.json
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/keycloak-server.json
@@ -1,6 +1,6 @@
 {
     "providers": [
-        "classpath:${jboss.server.config.dir}/providers/*"
+        "classpath:${jboss.home.dir}/providers/*"
     ],
 
     "admin": {
@@ -41,7 +41,7 @@
         "cacheTemplates": true,
         "cacheThemes": true,
         "folder": {
-          "dir": "${jboss.server.config.dir}/themes"
+          "dir": "${jboss.home.dir}/themes"
         }
     },
 
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/themes/README.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/content/themes/README.txt
similarity index 100%
rename from distribution/feature-packs/server-feature-pack/src/main/resources/content/standalone/configuration/themes/README.txt
rename to distribution/feature-packs/server-feature-pack/src/main/resources/content/themes/README.txt
diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
index 9d50f774f8..54165f3a0e 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -45,15 +45,15 @@
             <outputDirectory></outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/themes</directory>
-            <outputDirectory>standalone/configuration/themes</outputDirectory>
+            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/themes</directory>
+            <outputDirectory>themes</outputDirectory>
             <includes>
                 <include>**/**</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/standalone/configuration/providers</directory>
-            <outputDirectory>standalone/configuration/providers</outputDirectory>
+            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/providers</directory>
+            <outputDirectory>providers</outputDirectory>
             <includes>
                 <include>**/**</include>
             </includes>
diff --git a/docbook/auth-server-docs/reference/en/en-US/modules/MigrationFromOlderVersions.xml b/docbook/auth-server-docs/reference/en/en-US/modules/MigrationFromOlderVersions.xml
index 30bd80ce06..46fa368713 100755
--- a/docbook/auth-server-docs/reference/en/en-US/modules/MigrationFromOlderVersions.xml
+++ b/docbook/auth-server-docs/reference/en/en-US/modules/MigrationFromOlderVersions.xml
@@ -98,6 +98,14 @@
         <title>Version specific migration</title>
         <section>
             <title>Migrating to 1.9.0</title>
+            <simplesect>
+                <title>Themes and providers directory moved</title>
+                <para>
+                    We've moved the themes and providers directories from <literal>standalone/configuration/themes</literal> and <literal>standalone/configuration/providers</literal>
+                    to <literal>themes</literal> and <literal>providers</literal> respectively. If you have added custom themes and providers you need
+                    to move them to the new location. You also need to update <literal>keycloak-server.json</literal> as it's changed due to this.
+                </para>
+            </simplesect>
             <simplesect>
                 <title>Adapter Subsystems only bring in dependencies if keycloak is on</title>
                 <para>
diff --git a/examples/themes/src/main/resources/theme/logo-example/login/resources/css/logo.css b/examples/themes/src/main/resources/theme/logo-example/login/resources/css/logo.css
index eba035d7db..e58ebb4832 100755
--- a/examples/themes/src/main/resources/theme/logo-example/login/resources/css/logo.css
+++ b/examples/themes/src/main/resources/theme/logo-example/login/resources/css/logo.css
@@ -18,4 +18,5 @@
 #kc-logo-wrapper {
     background: url("../img/red-hat-logo.png") no-repeat top right;
     height: 45px;
+    width: 200px;
 }