keycloak-aplcache

diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-extensions/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-extensions/main/module.xml
index 9ccc11e..01af076 100755
--- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-extensions/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-extensions/main/module.xml
@@ -8,6 +8,8 @@
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-model-api"/>
         <module name="org.keycloak.keycloak-services"/>
+        <module name="org.keycloak.keycloak-forms-common-freemarker"/>
+        <module name="org.keycloak.keycloak-forms-common-themes"/>
         <module name="org.jboss.modules"/>
     </dependencies>
 </module>

diff --git a/examples/pom.xml b/examples/pom.xml
index eb68e33..1e81647 100755
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -34,5 +34,6 @@
         <module>basic-auth</module>
         <module>fuse</module>
         <module>kerberos</module>
+        <module>themes</module>
     </modules>
 </project>

diff --git a/examples/themes/README.md b/examples/themes/README.md
index 9f555bc..75ec61a 100644
--- a/examples/themes/README.md
+++ b/examples/themes/README.md
@@ -10,16 +10,16 @@ To use the theme you can either deploy it as a module or copy it to the Keycloak
 
 To deploy as a module run:
 
-   mvn clean install
-   $KEYCLOAK_HOME/bin/jboss-cli.sh --command="module add --name=org.keycloak.example.sunrisetheme --resources=target/keycloak-example-themes.jar"
+    mvn clean install
+    $KEYCLOAK_HOME/bin/jboss-cli.sh --command="module add --name=org.keycloak.example.sunrisetheme --resources=target/keycloak-example-themes.jar"
 
 Then open $KEYCLOAK_HOME/standalone/configuration/keycloak-server.json and register the theme module by adding:
     
-   "theme": {
-       "module": {
-           "modules": [ "org.keycloak.example.sunrisetheme" ]
-       }
-   }
+    "theme": {
+        "module": {
+            "modules": [ "org.keycloak.example.sunrisetheme" ]
+        }
+    }
 
 Alternatively you can copy `src/main/resources/theme/login` to `standalone/configuration/themes/login/`. 
 
@@ -40,11 +40,11 @@ To deploy as a module run:
 
 Then open $KEYCLOAK_HOME/standalone/configuration/keycloak-server.json and register the theme module by adding:
     
-   "theme": {
-       "module": {
-           "modules": [ "org.keycloak.example.logotheme" ]
-       }
-   }
+    "theme": {
+        "module": {
+            "modules": [ "org.keycloak.example.logotheme" ]
+        }
+    }
 
 Alternatively you can copy:
 

diff --git a/forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProvider.java b/forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProvider.java
index 7e83ca4..406f8c5 100644
--- a/forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProvider.java
+++ b/forms/common-themes/src/main/java/org/keycloak/theme/JarThemeProvider.java
@@ -26,7 +26,7 @@ public class JarThemeProvider implements ThemeProvider {
 
     @Override
     public Theme getTheme(String name, Theme.Type type) throws IOException {
-        return hasTheme(name, type) ? new ClassLoaderTheme(name, type, getClass().getClassLoader()) : null;
+        return hasTheme(name, type) ? themes.get(type).get(name) : null;
     }
 
     @Override