diff --git a/js/apps/create-keycloak-theme/create.js b/js/apps/create-keycloak-theme/create.js
index 47cebb7fd2..1678d6e042 100755
--- a/js/apps/create-keycloak-theme/create.js
+++ b/js/apps/create-keycloak-theme/create.js
@@ -57,7 +57,9 @@ function cloneQuickstart() {
           "--single-branch": undefined,
           "--branch": "main",
         })
-        .then(() => resolve(join(dir, "extension/extend-admin-console-node")));
+        .then(() =>
+          resolve(join(dir, "extension/extend-account-console-node")),
+        );
     });
   });
 }
diff --git a/js/apps/create-keycloak-theme/templates/maven-resources/theme/my-account/account/index.ftl.mu b/js/apps/create-keycloak-theme/templates/maven-resources/theme/my-account/account/index.ftl.mu
index 8c7da641c7..5f65e15c6c 100644
--- a/js/apps/create-keycloak-theme/templates/maven-resources/theme/my-account/account/index.ftl.mu
+++ b/js/apps/create-keycloak-theme/templates/maven-resources/theme/my-account/account/index.ftl.mu
@@ -8,10 +8,25 @@
     <meta name="description" content="${properties.description!'The {{type}} ui is a web-based management interface.'}">
     <title>${properties.title!'{{type}} Management'}</title>
     <style>
+      body {
+        margin: 0;
+      }
+
+      body, #app {
+        height: 100%;
+      }
+
+      .container {
+        padding: 0;
+        margin: 0;
+        width: 100%;
+      }
+
       .keycloak__loading-container {
         height: 100vh;
         width: 100%;
-        background-color: #f0f0f0;
+        color: #151515;
+        background-color: #fff;
         display: flex;
         align-items: center;
         justify-content: center;
@@ -19,30 +34,18 @@
         margin: 0;
       }
 
+      @media (prefers-color-scheme: dark) {
+        .keycloak__loading-container {
+          color: #e0e0e0;
+          background-color: #1b1d21;
+        }
+      }
+
       #loading-text {
+        z-index: 1000;
         font-size: 20px;
         font-weight: 600;
-      }
-
-      .loader {
-        width: 48px;
-        height: 48px;
-        border: 5px solid #FFF;
-        border-bottom-color: #06c;
-        border-radius: 50%;
-        display: inline-block;
-        box-sizing: border-box;
-        animation: rotation 1s linear infinite;
-      }
-
-      @keyframes rotation {
-        0% {
-          transform: rotate(0deg);
-        }
-
-        100% {
-          transform: rotate(360deg);
-        }
+        padding-top: 32px;
       }
     </style>
     <script type="importmap">
@@ -99,17 +102,23 @@
   </head>
   <body>
     <div id="app">
-    <div class="keycloak__loading-container">
-      <span class="loader" role="progressbar" aria-valuetext="Loading...">
-      </span>
-      <div>
-        <p id="loading-text">Loading the {{type}} ui</p>
-      </div>
+      <main class="container">
+        <div class="keycloak__loading-container">
+          <span class="pf-c-spinner pf-m-xl" role="progressbar" aria-valuetext="Loading&hellip;">
+            <span class="pf-c-spinner__clipper"></span>
+            <span class="pf-c-spinner__lead-ball"></span>
+            <span class="pf-c-spinner__tail-ball"></span>
+          </span>
+          <div>
+            <p id="loading-text">Loading the Account Console</p>
+          </div>
+        </div>
+      </main>
     </div>
-  </div>
-    <noscript>JavaScript is required to use the {{type}} ui.</noscript>
+    <noscript>JavaScript is required to use the Account Console.</noscript>
     <script id="environment" type="application/json">
       {
+        "serverBaseUrl": "${serverBaseUrl}",
         "authUrl": "${authUrl}",
         "authServerUrl": "${authServerUrl}",
         "realm": "${realm.name}",
@@ -127,6 +136,7 @@
           "isInternationalizationEnabled": ${realm.isInternationalizationEnabled()?c},
           "isLinkedAccountsEnabled": ${realm.identityFederationEnabled?c},
           "isMyResourcesEnabled": ${(realm.userManagedAccessAllowed && isAuthorizationEnabled)?c},
+          "isViewOrganizationsEnabled": ${isViewOrganizationsEnabled?c},
           "deleteAccountAllowed": ${deleteAccountAllowed?c},
           "updateEmailFeatureEnabled": ${updateEmailFeatureEnabled?c},
           "updateEmailActionEnabled": ${updateEmailActionEnabled?c},
diff --git a/js/apps/create-keycloak-theme/templates/pom.xml.mu b/js/apps/create-keycloak-theme/templates/pom.xml.mu
new file mode 100644
index 0000000000..0892fbaa95
--- /dev/null
+++ b/js/apps/create-keycloak-theme/templates/pom.xml.mu
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.keycloak</groupId>
+    <version>{{version}}</version>
+    <artifactId>my-account-ui</artifactId>
+    <name>My Account UI</name>
+    <description>The user inferface to manage an account on the Keycloak server.</description>
+
+    <properties>
+        <node.version>v20.13.0</node.version>
+    </properties>
+    <build>
+        <resources>
+            <resource>
+                <directory>maven-resources</directory>
+            </resource>
+            <resource>
+                <directory>dist</directory>
+                <targetPath>theme/my-account/account/resources</targetPath>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>1.15.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>npm-install</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>install</arguments>
+                            <workingDirectory>${maven.multiModuleProjectDirectory}</workingDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm-build</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>run build</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <nodeVersion>${node.version}</nodeVersion>
+                    <installDirectory>${maven.multiModuleProjectDirectory}</installDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
