Release debug build

Debug commit TO DELETE
2024-06-23 02:09:03 +02:00 · 2024-06-23 02:08:33 +02:00
138 changed files with 3748 additions and 4689 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -231,34 +231,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "madmadson",
-      "name": "Tobias Matt",
-      "avatar_url": "https://avatars.githubusercontent.com/u/798831?v=4",
-      "profile": "https://github.com/madmadson",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "oliviergoulet5",
-      "name": "Olivier Goulet",
-      "avatar_url": "https://avatars.githubusercontent.com/u/17685861?v=4",
-      "profile": "https://github.com/oliviergoulet5",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "liamlows",
-      "name": "Liam Lowsley-Williams",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1365914?v=4",
-      "profile": "https://github.com/liamlows",
-      "contributions": [
-        "code",
-        "doc"
-      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@ -17,7 +17,7 @@ jobs:
    - uses: actions/setup-node@v4
    - uses: bahmutov/npm-install@v1
    - name: If this step fails run 'npm run format' then commit again.
-      run: npm run _format --list-different
+      run: npm run format:check
  test:
    runs-on: ${{ matrix.os }}
    needs: test_lint
@ -37,7 +37,7 @@ jobs:

  storybook:
    runs-on: ubuntu-latest
-    if: github.event_name == 'push'
+    #if: github.event_name == 'push'
    needs: test
    steps:
    - uses: actions/checkout@v4
--- a/.gitignore
+++ b/.gitignore
@ -48,8 +48,8 @@ jspm_packages

 .idea

-/src/login/i18n/messages_defaultSet/
-/src/account/i18n/messages_defaultSet/
+/src/login/i18n/baseMessages/
+/src/account/i18n/baseMessages/

 # VS Code devcontainers
 .devcontainer
--- a/.prettierignore
+++ b/.prettierignore
@ -6,8 +6,8 @@ node_modules/
 /src/tools/types/
 /build_keycloak/
 /.vscode/
-/src/login/i18n/messages_defaultSet/
-/src/account/i18n/messages_defaultSet/
+/src/login/i18n/baseMessages/
+/src/account/i18n/baseMessages/
 /dist_test
 /sample_react_project/
 /sample_custom_react_project/
--- a/.storybook/Containers.js
+++ b/.storybook/Containers.js
@ -0,0 +1,70 @@
+
+import React from "react";
+import { DocsContainer as BaseContainer } from "@storybook/addon-docs";
+import { useDarkMode } from "storybook-dark-mode";
+import { darkTheme, lightTheme } from "./customTheme";
+import "./static/fonts/WorkSans/font.css";
+
+export function DocsContainer({ children, context }) {
+    const isStorybookUiDark = useDarkMode();
+
+    const theme = isStorybookUiDark ? darkTheme : lightTheme;
+
+    const backgroundColor = theme.appBg;
+
+    return (
+        <>
+            <style>{`
+                body {
+                    padding: 0 !important;
+                    background-color: ${backgroundColor};
+                }
+
+                .docs-story {
+                    background-color: ${backgroundColor};
+                }
+                [id^=story--] .container {
+                    border: 1px dashed #e8e8e8;
+                }
+
+                .docblock-argstable-head th:nth-child(3), .docblock-argstable-body tr > td:nth-child(3) {
+                    visibility: collapse;
+                }
+
+                .docblock-argstable-head th:nth-child(3), .docblock-argstable-body tr > td:nth-child(2) p {
+                    font-size: 13px;
+                }
+            `}</style>
+            <BaseContainer
+                context={{
+                    ...context,
+                    "storyById": id => {
+                        const storyContext = context.storyById(id);
+                        return {
+                            ...storyContext,
+                            "parameters": {
+                                ...storyContext?.parameters,
+                                "docs": {
+                                    ...storyContext?.parameters?.docs,
+                                    "theme": isStorybookUiDark ? darkTheme : lightTheme
+                                }
+                            }
+                        };
+                    }
+                }}
+            >
+                {children}
+            </BaseContainer>
+        </>
+    );
+}
+
+export function CanvasContainer({ children }) {
+
+    return (
+        <>
+            {children}
+        </>
+    );
+
+}
--- a/.storybook/customTheme.js
+++ b/.storybook/customTheme.js
@ -0,0 +1,35 @@
+import { create } from "@storybook/theming";
+
+const brandImage = "logo.png";
+const brandTitle = "Keycloakify";
+const brandUrl = "https://github.com/keycloakify/keycloakify";
+const fontBase = '"Work Sans", sans-serif';
+const fontCode = "monospace";
+
+export const darkTheme = create({
+    "base": "dark",
+    "appBg": "#1E1E1E",
+    "appContentBg": "#161616",
+    "barBg": "#161616",
+    "colorSecondary": "#8585F6",
+    "textColor": "#FFFFFF",
+    brandImage,
+    brandTitle,
+    brandUrl,
+    fontBase,
+    fontCode
+});
+
+export const lightTheme = create({
+    "base": "light",
+    "appBg": "#F6F6F6",
+    "appContentBg": "#FFFFFF",
+    "barBg": "#FFFFFF",
+    "colorSecondary": "#000091",
+    "textColor": "#212121",
+    brandImage,
+    brandTitle,
+    brandUrl,
+    fontBase,
+    fontCode
+});
--- a/.storybook/customTheme.ts
+++ b/.storybook/customTheme.ts
@ -1,33 +0,0 @@
-const brandImage = "logo.png";
-const brandTitle = "Keycloakify";
-const brandUrl = "https://github.com/keycloakify/keycloakify";
-const fontBase = '"Work Sans", sans-serif';
-const fontCode = "monospace";
-
-export const darkTheme = {
-    base: "dark",
-    appBg: "#1E1E1E",
-    appContentBg: "#161616",
-    barBg: "#161616",
-    colorSecondary: "#8585F6",
-    textColor: "#FFFFFF",
-    brandImage,
-    brandTitle,
-    brandUrl,
-    fontBase,
-    fontCode
-};
-
-export const lightTheme: typeof darkTheme = {
-    base: "light",
-    appBg: "#F6F6F6",
-    appContentBg: "#FFFFFF",
-    barBg: "#FFFFFF",
-    colorSecondary: "#000091",
-    textColor: "#212121",
-    brandImage,
-    brandTitle,
-    brandUrl,
-    fontBase,
-    fontCode
-};
--- a/.storybook/main.js
+++ b/.storybook/main.js
@ -1,13 +1,15 @@
 module.exports = {
-    stories: [
-        "../stories/**/*.stories.tsx"
+    "stories": [
+        "../stories/**/*.stories.@(ts|tsx|mdx)"
    ],
-    addons: [
+    "addons": [
+        "@storybook/addon-links",
+        "@storybook/addon-essentials",
        "storybook-dark-mode",
        "@storybook/addon-a11y"
    ],
-    core: {
-        builder: "webpack5"
+    "core": {
+        "builder": "webpack5"
    },
-    staticDirs: ["./static"]
+    "staticDirs": ["./static"]
 };
--- a/.storybook/manager.js
+++ b/.storybook/manager.js
@ -1,6 +1,6 @@
 import { addons } from '@storybook/addons';

 addons.setConfig({
-  selectedPanel: 'storybook/a11y/panel',
-  showPanel: false
+  "selectedPanel": 'storybook/a11y/panel',
+  "showPanel": false,
 });
--- a/.storybook/preview-head.html
+++ b/.storybook/preview-head.html
@ -1,9 +1,3 @@
-<link rel="preload" href="/fonts/WorkSans/worksans-bold-webfont.woff2" as="font" crossorigin="anonymous">
-<link rel="preload" href="/fonts/WorkSans/worksans-medium-webfont.woff2" as="font" crossorigin="anonymous">
-<link rel="preload" href="/fonts/WorkSans/worksans-regular-webfont.woff2" as="font" crossorigin="anonymous">
-<link rel="preload" href="/fonts/WorkSans/worksans-semibold-webfont.woff2" as="font" crossorigin="anonymous">
-<link rel="stylesheet" type="text/css" href="/fonts/WorkSans/font.css">
-
 <style>
    body.sb-show-main.sb-main-padded {
        padding: 0;
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@ -1,105 +1,116 @@
 import { darkTheme, lightTheme } from "./customTheme";
-import { create as createTheme } from "@storybook/theming";
+import { DocsContainer, CanvasContainer } from "./Containers";

 export const parameters = {
-    actions: { argTypesRegex: "^on[A-Z].*" },
-    controls: {
-        matchers: {
-            color: /(background|color)$/i,
-            date: /Date$/,
+    "actions": { "argTypesRegex": "^on[A-Z].*" },
+    "controls": {
+        "matchers": {
+            "color": /(background|color)$/i,
+            "date": /Date$/,
        },
    },
-    backgrounds: { disable: true },
-    darkMode: {
-        light: createTheme(lightTheme),
-        dark: createTheme(darkTheme),
+    "backgrounds": { "disable": true },
+    "darkMode": {
+        "light": lightTheme,
+        "dark": darkTheme,
    },
-    controls: {
-        disable: true,
+    "docs": {
+        "container": DocsContainer
    },
-    actions: {
-        disable: true
+    "controls": {
+        "disable": true,
    },
-    viewport: {
-        viewports: {
+    "actions": {
+        "disable": true
+    },
+    "viewport": {
+        "viewports": {
            "1440p": {
-                name: "1440p",
-                styles: {
-                    width: "2560px",
-                    height: "1440px",
+                "name": "1440p",
+                "styles": {
+                    "width": "2560px",
+                    "height": "1440px",
                },
            },
-            fullHD: {
-                name: "Full HD",
-                styles: {
-                    width: "1920px",
-                    height: "1080px",
+            "fullHD": {
+                "name": "Full HD",
+                "styles": {
+                    "width": "1920px",
+                    "height": "1080px",
                },
            },
-            macBookProBig: {
-                name: "MacBook Pro Big",
-                styles: {
-                    width: "1024px",
-                    height: "640px",
+            "macBookProBig": {
+                "name": "MacBook Pro Big",
+                "styles": {
+                    "width": "1024px",
+                    "height": "640px",
                },
            },
-            macBookProMedium: {
-                name: "MacBook Pro Medium",
-                styles: {
-                    width: "1440px",
-                    height: "900px",
+            "macBookProMedium": {
+                "name": "MacBook Pro Medium",
+                "styles": {
+                    "width": "1440px",
+                    "height": "900px",
                },
            },
-            macBookProSmall: {
-                name: "MacBook Pro Small",
-                styles: {
-                    width: "1680px",
-                    height: "1050px",
+            "macBookProSmall": {
+                "name": "MacBook Pro Small",
+                "styles": {
+                    "width": "1680px",
+                    "height": "1050px",
                },
            },
-            pcAgent: {
-                name: "PC Agent",
-                styles: {
-                    width: "960px",
-                    height: "540px",
+            "pcAgent": {
+                "name": "PC Agent",
+                "styles": {
+                    "width": "960px",
+                    "height": "540px",
                },
            },
-            iphone12Pro: {
-                name: "Iphone 12 pro",
-                styles: {
-                    width: "390px",
-                    height: "844px",
+            "iphone12Pro": {
+                "name": "Iphone 12 pro",
+                "styles": {
+                    "width": "390px",
+                    "height": "844px",
                },
            },
-            iphone5se: {
-                name: "Iphone 5/SE",
-                styles: {
-                    width: "320px",
-                    height: "568px",
+            "iphone5se": {
+                "name": "Iphone 5/SE",
+                "styles": {
+                    "width": "320px",
+                    "height": "568px",
                },
            },
-            ipadPro: {
-                name: "Ipad pro",
-                styles: {
-                    width: "1240px",
-                    height: "1366px",
+            "ipadPro": {
+                "name": "Ipad pro",
+                "styles": {
+                    "width": "1240px",
+                    "height": "1366px",
                },
            },
            "Galaxy s9+": {
-                name: "Galaxy S9+",
-                styles: {
-                    width: "320px",
-                    height: "658px",
+                "name": "Galaxy S9+",
+                "styles": {
+                    "width": "320px",
+                    "height": "658px",
                },
            }
        },
    },
-    options: {
-        storySort: (a, b) =>
+    "options": {
+        "storySort": (a, b) =>
            getHardCodedWeight(b[1].kind) - getHardCodedWeight(a[1].kind),
    },
 };

+export const decorators = [
+    (Story) => (
+        <CanvasContainer>
+            <Story />
+        </CanvasContainer>
+    ),
+];
+
 const { getHardCodedWeight } = (() => {

    const orderedPagesPrefix = [
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@
    <img src="https://user-images.githubusercontent.com/6702424/109387840-eba11f80-7903-11eb-9050-db1dad883f78.png">  
 </p>
 <p align="center">
-    <i>🔏 Keycloak Theming for the Modern Web 🔏</i>
+    <i>🔏 Create Keycloak themes using React 🔏</i>
    <br>
    <br>
    <a href="https://github.com/garronej/keycloakify/actions">
@ -17,12 +17,9 @@
    <a href="https://github.com/thomasdarimont/awesome-keycloak">
        <img src="https://awesome.re/mentioned-badge.svg"/>
    </a>
-    <p align="center">
-      Check out our discord server!<br/>
-      <a href="https://discord.gg/mJdYJSdcm4">
-        <img src="https://dcbadge.limes.pink/api/server/kYFZG7fQmn"/>
-      </a>
-    </p>
+    <a href="https://discord.gg/kYFZG7fQmn">
+        <img src="https://img.shields.io/discord/1097708346976505977"/>
+    </a>
    <p align="center">
        <a href="https://www.keycloakify.dev">Home</a>
        -
@ -38,36 +35,23 @@
    <i>This build tool generates a Keycloak theme <a href="https://www.keycloakify.dev">Learn more</a></i>
    <br/>
    <br/>
-    <img width="400" src="https://github.com/user-attachments/assets/6bf3bef9-00b0-4460-97b9-0d2da8500798">
+    <img width="400" src="https://github.com/keycloakify/keycloakify/assets/6702424/e66d105c-c06f-47d1-8a31-a6ab09da4e80">
 </p>

-Keycloakify is fully compatible with Keycloak 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, [~~22~~](https://github.com/keycloakify/keycloakify/issues/389#issuecomment-1822509763), 23, 24, 25...[and beyond](https://github.com/keycloakify/keycloakify/discussions/346#discussioncomment-5889791)
+Keycloakify is fully compatible with Keycloak 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, [~~22~~](https://github.com/keycloakify/keycloakify/issues/389#issuecomment-1822509763), **23** [and up](https://github.com/keycloakify/keycloakify/discussions/346#discussioncomment-5889791)!

-## Sponsors
+> NOTE: Keycloak 24 introduces [important changes](https://www.keycloak.org/docs/latest/upgrading/index.html#changes-to-freemarker-templates-to-render-pages-based-on-the-user-profile-and-realm).  
+> We're actively working on incorporating them into Keycloakify. [Follow progress](https://github.com/keycloakify/keycloakify/pull/538).

-Friends for the project, we trust and recommend their services.
+## Sponsor

-<br/>
+We are exclusively sponsored by [Cloud IAM](https://cloud-iam.com/?mtm_campaign=keycloakify-deal&mtm_source=keycloakify-github), a French company offering Keycloak as a service.  
+Their dedicated support helps us continue the development and maintenance of this project.

-<div align="center">
+[Cloud IAM](https://cloud-iam.com/?mtm_campaign=keycloakify-deal&mtm_source=keycloakify-github) provides the following services:

-![Logo Dark](https://github.com/user-attachments/assets/088f6631-b7ef-42ad-812b-df4870dc16ae#gh-dark-mode-only)
-
-</div>
-
-<div align="center">
-
-![Logo Light](https://github.com/user-attachments/assets/53fb16f8-02ef-4523-9c36-b42d6e59837e#gh-light-mode-only)
-
-</div>
-
-<br/>
-
-<p align="center">
-  <a href="https://www.zone2.tech/services/keycloak-consulting">
-    <i><strong>Keycloak Consulting Services</strong> - Your partner in Keycloak deployment, configuration, and extension development for optimized identity management solutions.</i>
-  </a>
-</p>
+-   Simplify and secure your Keycloak Identity and Access Management. Keycloak as a Service.
+-   Custom theme building for your brand using Keycloakify.

 <div align="center">

@ -82,11 +66,13 @@ Friends for the project, we trust and recommend their services.
 </div>

 <p align="center">
-<a href="https://cloud-iam.com/?mtm_campaign=keycloakify-deal&mtm_source=keycloakify-github"><strong>Managed Keycloak Provider</strong> - With Cloud-IAM powering your Keycloak clusters, you can sleep easy knowing you've got the software and the experts you need for operational excellence.  </a>
-<br/>
-Use code <code>keycloakify5</code> at checkout for a 5% discount.
+    <i>Checkout <a href="https://cloud-iam.com/?mtm_campaign=keycloakify-deal&mtm_source=keycloakify-github">Cloud-IAM</a> and use promo code <code>keycloakify5</code></i>
+    <br/>
+    <i>5% of your annual subscription will be donated to us, and you'll get 5% off too.</i>
 </p>

+Thank you, [Cloud-IAM](https://cloud-iam.com/?mtm_campaign=keycloakify-deal&mtm_source=keycloakify-github), for your support!
+
 ## Contributors ✨

 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@ -128,9 +114,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
      <td align="center" valign="top" width="14.28%"><a href="https://m-siemens.de/"><img src="https://avatars.githubusercontent.com/u/1873922?v=4?s=100" width="100px;" alt="Markus Siemens"/><br /><sub><b>Markus Siemens</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=msiemens" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/law108000"><img src="https://avatars.githubusercontent.com/u/8112024?v=4?s=100" width="100px;" alt="Rlok"/><br /><sub><b>Rlok</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=law108000" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Moulyy"><img src="https://avatars.githubusercontent.com/u/115405804?v=4?s=100" width="100px;" alt="Moulyy"/><br /><sub><b>Moulyy</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=Moulyy" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/madmadson"><img src="https://avatars.githubusercontent.com/u/798831?v=4?s=100" width="100px;" alt="Tobias Matt"/><br /><sub><b>Tobias Matt</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=madmadson" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/oliviergoulet5"><img src="https://avatars.githubusercontent.com/u/17685861?v=4?s=100" width="100px;" alt="Olivier Goulet"/><br /><sub><b>Olivier Goulet</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=oliviergoulet5" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/liamlows"><img src="https://avatars.githubusercontent.com/u/1365914?v=4?s=100" width="100px;" alt="Liam Lowsley-Williams"/><br /><sub><b>Liam Lowsley-Williams</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=liamlows" title="Code">💻</a> <a href="https://github.com/keycloakify/keycloakify/commits?author=liamlows" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/giorgoslytos"><img src="https://avatars.githubusercontent.com/u/50946162?v=4?s=100" width="100px;" alt="giorgoslytos"/><br /><sub><b>giorgoslytos</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=giorgoslytos" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
@ -139,3 +123,230 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- prettier-ignore-end -->

 <!-- ALL-CONTRIBUTORS-LIST:END -->
+
+# Changelog highlights
+
+## 9.5
+
+-   Post build hook: You can now apply custom transformation to your theme files. [Learn more](https://docs.keycloakify.dev/build-options#postbuild-hook).
+-   You can now specify your option in the Keycloakify's Vite plugin instead in the package.json. [See example](https://docs.keycloakify.dev/build-options#themename).
+
+## 9.4
+
+**Vite Support! 🎉**
+
+-   [The starter is now a Vite project](https://github.com/keycloakify/keycloakify-starter).
+    The Webpack based starter is accessible [here](https://github.com/keycloakify/keycloakify-starter-cra).
+-   CRA (Webpack) remains supported for the forseable future.
+-   If you have a CRA Keycloakify theme that you wish to migrate to Vite checkout [this migration guide](https://docs.keycloakify.dev/migration-guides/cra-greater-than-vite).
+
+## 9.0
+
+Bring back support for account themes in Keycloak v23 and up! [See issue](https://github.com/keycloakify/keycloakify/issues/389).
+
+### Breaking changes
+
+Very few. Check them out [here](https://docs.keycloakify.dev/migration-guides/v8-greater-than-v9).
+
+## 8.0
+
+-   Much smaller .jar size. 70.2 MB -> 7.8 MB.  
+    Keycloakify now detects which of the static resources from the default theme are actually used by your theme and only include those in the .jar.
+-   Build time: The first build is slowed but the subsequent build are faster. [Update your CI so that the cache is persisted across CI build](https://github.com/keycloakify/keycloakify-starter/commit/bc378d5afb67e796f520afbc348185f3e319d9d0).
+
+### Breaking changes
+
+There are very few breaking changes in this major version. [Check them out](https://docs.keycloakify.dev/migration-guides/v7-greater-than-v8).
+
+## 7.15
+
+-   The i18n messages you defines in your theme are now also maid available to Keycloak.
+    In practice this mean that you can now customize the `kcContext.message.summary` that
+    display a general alert and the values returned by `kcContext.messagesPerField.get()` that
+    are used to display specific error on some field of the form.
+    [See video](https://youtu.be/D6tZcemReTI)
+
+## 7.14
+
+-   Deprecate the `extraPages` build option. Keycloakify is now able to analyze your code to detect extra pages.
+
+## 7.13
+
+-   Deprecate `customUserAttribute`, Keycloakify now analyze your code to predict field name usage. [See doc](https://docs.keycloakify.dev/build-options#customuserattributes).  
+    It's now mandatory to [adopt the new directory structure](https://docs.keycloakify.dev/migration-guides/v6-greater-than-v7).
+
+## 7.12
+
+-   You can now pack multiple themes variant in a single `.jar` bundle. In vanilla Keycloak themes you have the ability to extend a base theme.
+    There is now an idiomatic way of achieving the same result. [Learn more](https://docs.keycloakify.dev/build-options#keycloakify.themeVariantNames).
+
+## 7.9
+
+-   Separate script for copying the default theme static assets to the public directory.  
+    Theses assets are only needed for testing your theme locally in Storybook or with a `mockPageId`.  
+    You are now expected to have a `"prepare": "copy-keycloak-resources-to-public",` in your package.json scripts.  
+    This script will create `public/keycloak-assets` when you run `yarn install` (If you are using another package manager
+    like `pnpm` makes sure that `"prepare"` is actually ran.)  
+    [See the updated starter](https://github.com/keycloakify/keycloakify-starter/blob/94532fcf10bf8b19e0873be8575fd28a8958a806/package.json#L11). `public/keycloak-assets` shouldn't be tracked by GIT and is automatically ignored.
+
+## 7.7
+
+-   Better storybook support, see [the starter project](https://github.com/keycloakify/keycloakify-starter).
+
+## 7.0 🍾
+
+-   Account theme support 🚀
+-   It's much easier to customize pages at the CSS level, you can now see in the browser dev tool the customizable classes.
+-   New interactive CLI tool `npx eject-keycloak-page`, that enables to select the page you want to customize at the component level.
+-   There is [a Storybook](https://storybook.keycloakify.dev)
+-   [Remember me is fixed](https://github.com/keycloakify/keycloakify/pull/272)
+
+## 6.13
+
+-   Build work behind corporate proxies, [see issue](https://github.com/keycloakify/keycloakify/issues/257).
+
+## 6.12
+
+Massive improvement in the developer experience:
+
+-   There is now only one starter repo: https://github.com/codegouvfr/keycloakify-starter
+-   A lot of comments have been added in the code of the starter to make it easier to get started.
+-   The doc has been updated: https://docs.keycloakify.dev
+-   A lot of improvements in the type system.
+
+## 6.11.4
+
+-   You no longer need to have Maven installed to build the theme. Thanks to @lordvlad, [see PR](https://github.com/keycloakify/keycloakify/pull/239).
+-   Feature new build options: [`bundler`](https://docs.keycloakify.dev/build-options#keycloakify.bundler), [`groupId`](https://docs.keycloakify.dev/build-options#keycloakify.groupid), [`artifactId`](https://docs.keycloakify.dev/build-options#keycloakify.artifactid), [`version`](https://docs.keycloakify.dev/build-options#version).  
+    Theses options can be user to customize the output name of the .jar. You can use environnement variables to overrides the values read in the package.json. Thanks to @lordvlad.
+
+## 6.10.0
+
+-   Widows compat (thanks to @lordvlad, [see PR](https://github.com/keycloakify/keycloakify/pull/226)). WSL is no longer required 🎉
+
+## 6.8.4
+
+-   `@emotion/react` is no longer a peer dependency of Keycloakify.
+
+## 6.8.0
+
+-   It is now possible to pass a custom `<Template />` component as a prop to `<KcApp />` and every
+    individual page (`<Login />`, `<RegisterUserProfile />`, ...) it enables to customize only the header and footer for
+    example without having to switch to a full-component level customization. [See issue](https://github.com/keycloakify/keycloakify/issues/191).
+
+## 6.7.0
+
+-   Add support for `webauthn-authenticate.ftl` thanks to [@mstrodl](https://github.com/Mstrodl)'s hacktoberfest [PR](https://github.com/keycloakify/keycloakify/pull/185).
+
+## 6.6.0
+
+-   Add support for `login-password.ftl` thanks to [@mstrodl](https://github.com/Mstrodl)'s hacktoberfest [PR](https://github.com/keycloakify/keycloakify/pull/184).
+
+## 6.5.0
+
+-   Add support for `login-username.ftl` thanks to [@mstrodl](https://github.com/Mstrodl)'s hacktoberfest [PR](https://github.com/keycloakify/keycloakify/pull/183).
+
+## 6.4.0
+
+-   You can now optionally pass a `doFetchDefaultThemeResources: boolean` prop to every page component and the default `<KcApp />`
+    This enables you to prevent the default CSS and JS that comes with the builtin Keycloak theme to be downloaded.  
+    You'll get [a black slate](https://user-images.githubusercontent.com/6702424/192619083-4baa5df4-4a21-4ec7-8e28-d200d1208299.png).
+
+## 6.0.0
+
+-   Bundle size drastically reduced, locals and component dynamically loaded.
+-   First print much quicker, use of React.lazy() everywhere.
+-   Real i18n API.
+-   Actual documentation for build options.
+
+Checkout [the migration guide](https://docs.keycloakify.dev/v5-to-v6)
+
+## 5.8.0
+
+-   [React.lazy()](https://reactjs.org/docs/code-splitting.html#reactlazy) support 🎉. [#141](https://github.com/keycloakify/keycloakify/issues/141)
+
+## 5.7.0
+
+-   Feat `logout-confirm.ftl`. [PR](https://github.com/keycloakify/keycloakify/pull/120)
+
+## 5.6.4
+
+Fix `login-verify-email.ftl` page. [Before](https://user-images.githubusercontent.com/6702424/177436014-0bad22c4-5bfb-45bb-8fc9-dad65143cd0c.png) - [After](https://user-images.githubusercontent.com/6702424/177435797-ec5d7db3-84cf-49cb-8efc-3427a81f744e.png)
+
+## 5.6.0
+
+Add support for `login-config-totp.ftl` page [#127](https://github.com/keycloakify/keycloakify/pull/127).
+
+## 5.3.0
+
+Rename `keycloak_theme_email` to `keycloak_email`.  
+If you already had a `keycloak_theme_email` you should rename it `keycloak_email`.
+
+## 5.0.0
+
+[Migration guide](https://github.com/garronej/keycloakify-demo-app/blob/a5b6a50f24bc25e082931f5ad9ebf47492acd12a/src/index.tsx#L46-L63)  
+New i18n system.  
+Import of terms and services have changed. [See example](https://github.com/garronej/keycloakify-demo-app/blob/a5b6a50f24bc25e082931f5ad9ebf47492acd12a/src/index.tsx#L46-L63).
+
+## 4.10.0
+
+Add `login-idp-link-email.ftl` page [See PR](https://github.com/keycloakify/keycloakify/pull/92).
+
+## 4.8.0
+
+[Email template customization.](#email-template-customization)
+
+## 4.7.4
+
+**M1 Mac** support (for testing locally with a dockerized Keycloak).
+
+## 4.7.2
+
+> WARNING: This is broken.  
+> Testing with local Keycloak container working with M1 Mac. Thanks to [@eduardosanzb](https://github.com/keycloakify/keycloakify/issues/43#issuecomment-975699658).  
+> Be aware: When running M1s you are testing with Keycloak v15 else the local container spun will be a Keycloak v16.1.0.
+
+## 4.7.0
+
+Register with user profile enabled: Out of the box `options` validator support.  
+[Example](https://user-images.githubusercontent.com/6702424/158911163-81e6bbe8-feb0-4dc8-abff-de199d7a678e.mov)
+
+## 4.6.0
+
+`tss-react` and `powerhooks` are no longer peer dependencies of `keycloakify`.
+After updating Keycloakify you can remove `tss-react` and `powerhooks` from your dependencies if you don't use them explicitly.
+
+## 4.5.3
+
+There is a new recommended way to setup highly customized theme. See [here](https://github.com/garronej/keycloakify-demo-app/blob/look_and_feel/src/KcApp/KcApp.tsx).  
+Unlike with [the previous recommended method](https://github.com/garronej/keycloakify-demo-app/blob/a51660578bea15fb3e506b8a2b78e1056c6d68bb/src/KcApp/KcApp.tsx),
+with this new method your theme wont break on minor Keycloakify update.
+
+## 4.3.0
+
+Feature [`login-update-password.ftl`](https://user-images.githubusercontent.com/6702424/147517600-6191cf72-93dd-437b-a35c-47180142063e.png).  
+Every time a page is added it's a breaking change for non CSS-only theme.  
+Change [this](https://github.com/garronej/keycloakify-demo-app/blob/df664c13c77ce3c53ac7df0622d94d04e76d3f9f/src/KcApp/KcApp.tsx#L17) and [this](https://github.com/garronej/keycloakify-demo-app/blob/df664c13c77ce3c53ac7df0622d94d04e76d3f9f/src/KcApp/KcApp.tsx#L37) to update.
+
+## 4
+
+-   Out of the box [frontend form validation](#user-profile-and-frontend-form-validation) 🥳
+-   Improvements (and breaking changes in `import { useKcMessage } from "keycloakify"`.
+
+## 3
+
+No breaking changes except that `@emotion/react`, [`tss-react`](https://www.npmjs.com/package/tss-react) and [`powerhooks`](https://www.npmjs.com/package/powerhooks) are now `peerDependencies` instead of being just dependencies.  
+It's important to avoid problem when using `keycloakify` alongside [`mui`](https://mui.com) and
+[when passing params from the app to the login page](https://github.com/keycloakify/keycloakify#implement-context-persistence-optional).
+
+## 2.5
+
+-   Feature [Use advanced message](https://github.com/keycloakify/keycloakify/blob/59f106bf9e210b63b190826da2bf5f75fc8b7644/src/lib/i18n/useKcMessage.tsx#L53-L66)
+    and [`messagesPerFields`](https://github.com/keycloakify/keycloakify/blob/59f106bf9e210b63b190826da2bf5f75fc8b7644/src/lib/getKcContext/KcContextBase.ts#L70-L75) (implementation [here](https://github.com/keycloakify/keycloakify/blob/59f106bf9e210b63b190826da2bf5f75fc8b7644/src/bin/build-keycloak-theme/generateFtl/common.ftl#L130-L189))
+-   Test container now uses Keycloak version `15.0.2`.
+
+## 2
+
+-   It's now possible to implement custom `.ftl` pages.
+-   Support for Keycloak plugins that introduce non standard ftl values.
+    (Like for example [this plugin](https://github.com/micedre/keycloak-mail-whitelisting) that define `authorizedMailDomains` in `register.ftl`).
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "keycloakify",
-    "version": "10.0.1",
+    "version": "10.0.0-rc.90",
    "description": "Create Keycloak themes using React",
    "repository": {
        "type": "git",
@ -15,6 +15,7 @@
        "test:types": "tsc -p test/tsconfig.json --noEmit",
        "_format": "prettier '**/*.{ts,tsx,json,md}'",
        "format": "yarn _format --write",
+        "format:check": "yarn _format --list-different",
        "link-in-app": "tsx scripts/link-in-app.ts",
        "build-storybook": "tsx scripts/build-storybook.ts",
        "dump-keycloak-realm": "tsx scripts/dump-keycloak-realm.ts"
@ -40,14 +41,14 @@
        "!dist/bin/",
        "dist/bin/main.js",
        "dist/bin/*.index.js",
-        "dist/bin/*.node",
+        "!dist/bin/shared/*.js",
        "dist/bin/shared/constants.js",
        "dist/bin/shared/*.d.ts",
        "dist/bin/shared/*.js.map",
        "!dist/vite-plugin/",
-        "dist/vite-plugin/index.js",
        "dist/vite-plugin/index.d.ts",
-        "dist/vite-plugin/vite-plugin.d.ts"
+        "dist/vite-plugin/vite-plugin.d.ts",
+        "dist/vite-plugin/index.js"
    ],
    "keywords": [
        "keycloak",
@ -72,10 +73,14 @@
        "@emotion/react": "^11.11.4",
        "@octokit/rest": "^20.1.1",
        "@storybook/addon-a11y": "^6.5.16",
+        "@storybook/addon-actions": "^6.5.13",
+        "@storybook/addon-essentials": "^6.5.13",
+        "@storybook/addon-interactions": "^6.5.13",
+        "@storybook/addon-links": "^6.5.13",
        "@storybook/builder-webpack5": "^6.5.13",
        "@storybook/manager-webpack5": "^6.5.13",
        "@storybook/react": "^6.5.13",
-        "eslint-plugin-storybook": "^0.6.7",
+        "@storybook/testing-library": "^0.0.13",
        "@types/babel__generator": "^7.6.4",
        "@types/make-fetch-happen": "^10.0.1",
        "@types/minimist": "^1.2.2",
@ -85,9 +90,10 @@
        "@types/yauzl": "^2.10.3",
        "@vercel/ncc": "^0.38.1",
        "chalk": "^4.1.2",
-        "cheerio": "1.0.0-rc.12",
+        "cheerio": "^1.0.0-rc.12",
        "chokidar-cli": "^3.0.0",
        "cli-select": "^1.1.2",
+        "eslint-plugin-storybook": "^0.6.7",
        "husky": "^4.3.8",
        "lint-staged": "^11.0.0",
        "magic-string": "^0.30.7",
@ -103,7 +109,7 @@
        "termost": "^v0.12.1",
        "tsc-alias": "^1.8.10",
        "tss-react": "^4.9.10",
-        "typescript": "^4.9.4",
+        "typescript": "^4.9.1-beta",
        "vite": "^5.2.11",
        "vitest": "^1.6.0",
        "yauzl": "^2.10.0",
--- a/scripts/build-storybook.ts
+++ b/scripts/build-storybook.ts
@ -1,13 +1,16 @@
 import * as child_process from "child_process";
-import { copyKeycloakResourcesToStorybookStaticDir } from "./copyKeycloakResourcesToStorybookStaticDir";
+import { join } from "path";

-(async () => {
-    run("yarn build");
+run("yarn build");

-    await copyKeycloakResourcesToStorybookStaticDir();
+run(`node ${join("dist", "bin", "main.js")} copy-keycloak-resources-to-public`, {
+    env: {
+        ...process.env,
+        PUBLIC_DIR_PATH: join(".storybook", "static")
+    }
+});

-    run("npx build-storybook");
-})();
+run("npx build-storybook");

 function run(command: string, options?: { env?: NodeJS.ProcessEnv }) {
    console.log(`$ ${command}`);
--- a/scripts/build.ts
+++ b/scripts/build.ts
@ -1,6 +1,6 @@
 import * as child_process from "child_process";
 import * as fs from "fs";
-import { join } from "path";
+import { join, relative } from "path";
 import { assert } from "tsafe/assert";
 import { transformCodebase } from "../src/bin/tools/transformCodebase";
 import chalk from "chalk";
@ -16,7 +16,7 @@ if (fs.existsSync(join("dist", "bin", "main.original.js"))) {
    );

    fs.readdirSync(join("dist", "bin")).forEach(fileBasename => {
-        if (/[0-9]\.index.js/.test(fileBasename) || fileBasename.endsWith(".node")) {
+        if (/[0-9]\.index.js/.test(fileBasename)) {
            fs.rmSync(join("dist", "bin", fileBasename));
        }
    });
@ -111,10 +111,9 @@ run(
    )}`
 );

-fs.readdirSync(join("dist", "ncc_out")).forEach(fileBasename => {
-    assert(!fileBasename.endsWith(".index.js"));
-    assert(!fileBasename.endsWith(".node"));
-});
+fs.readdirSync(join("dist", "ncc_out")).forEach(fileBasename =>
+    assert(!fileBasename.endsWith(".index.js"))
+);

 transformCodebase({
    srcDirPath: join("dist", "ncc_out"),
--- a/scripts/copyKeycloakResourcesToStorybookStaticDir.ts
+++ b/scripts/copyKeycloakResourcesToStorybookStaticDir.ts
@ -1,18 +0,0 @@
-import { join as pathJoin } from "path";
-import { copyKeycloakResourcesToPublic } from "../src/bin/shared/copyKeycloakResourcesToPublic";
-import { getProxyFetchOptions } from "../src/bin/tools/fetchProxyOptions";
-import { LOGIN_THEME_RESOURCES_FROMkEYCLOAK_VERSION_DEFAULT } from "../src/bin/shared/constants";
-
-export async function copyKeycloakResourcesToStorybookStaticDir() {
-    await copyKeycloakResourcesToPublic({
-        buildContext: {
-            cacheDirPath: pathJoin(__dirname, "..", "node_modules", ".cache", "scripts"),
-            fetchOptions: getProxyFetchOptions({
-                npmConfigGetCwd: pathJoin(__dirname, "..")
-            }),
-            loginThemeResourcesFromKeycloakVersion:
-                LOGIN_THEME_RESOURCES_FROMkEYCLOAK_VERSION_DEFAULT,
-            publicDirPath: pathJoin(__dirname, "..", ".storybook", "static")
-        }
-    });
-}
--- a/scripts/dump-keycloak-realm.ts
+++ b/scripts/dump-keycloak-realm.ts
@ -1,4 +1,4 @@
-import { CONTAINER_NAME } from "../src/bin/shared/constants";
+import { containerName } from "../src/bin/shared/constants";
 import child_process from "child_process";
 import { SemVer } from "../src/bin/tools/SemVer";
 import { join as pathJoin, relative as pathRelative } from "path";
@ -14,7 +14,7 @@ import { is } from "tsafe/is";
        const child = child_process.spawn(
            "docker",
            [
-                ...["exec", CONTAINER_NAME],
+                ...["exec", containerName],
                ...["/opt/keycloak/bin/kc.sh", "export"],
                ...["--dir", "/tmp"],
                ...["--realm", "myrealm"],
@ -62,7 +62,7 @@ import { is } from "tsafe/is";

    const keycloakMajorVersionNumber = SemVer.parse(
        child_process
-            .execSync(`docker inspect --format '{{.Config.Image}}' ${CONTAINER_NAME}`)
+            .execSync(`docker inspect --format '{{.Config.Image}}' ${containerName}`)
            .toString("utf8")
            .trim()
            .split(":")[1]
@ -80,7 +80,7 @@ import { is } from "tsafe/is";
        )
    );

-    run(`docker cp ${CONTAINER_NAME}:/tmp/myrealm-realm.json ${targetFilePath}`);
+    run(`docker cp ${containerName}:/tmp/myrealm-realm.json ${targetFilePath}`);

    console.log(`${chalk.green(`✓ Exported realm to`)} ${chalk.bold(targetFilePath)}`);
 })();
--- a/scripts/generate-i18n-messages.ts
+++ b/scripts/generate-i18n-messages.ts
@ -12,7 +12,6 @@ import { crawl } from "../src/bin/tools/crawl";
 import { downloadKeycloakDefaultTheme } from "../src/bin/shared/downloadKeycloakDefaultTheme";
 import { getThisCodebaseRootDirPath } from "../src/bin/tools/getThisCodebaseRootDirPath";
 import { deepAssign } from "../src/tools/deepAssign";
-import { getProxyFetchOptions } from "../src/bin/tools/fetchProxyOptions";

 // NOTE: To run without argument when we want to generate src/i18n/generated_kcMessages files,
 // update the version array for generating for newer version.
@ -34,9 +33,7 @@ async function main() {
                ".cache",
                "keycloakify"
            ),
-            fetchOptions: getProxyFetchOptions({
-                npmConfigGetCwd: thisCodebaseRootDirPath
-            })
+            npmWorkspaceRootDirPath: thisCodebaseRootDirPath
        }
    });

@ -110,12 +107,12 @@ async function main() {
            source: keycloakifyExtraMessages
        });

-        const messagesDirPath = pathJoin(
+        const baseMessagesDirPath = pathJoin(
            thisCodebaseRootDirPath,
            "src",
            themeType,
            "i18n",
-            "messages_defaultSet"
+            "baseMessages"
        );

        const generatedFileHeader = [
@ -127,7 +124,7 @@ async function main() {
        ].join("\n");

        languages.forEach(language => {
-            const filePath = pathJoin(messagesDirPath, `${language}.ts`);
+            const filePath = pathJoin(baseMessagesDirPath, `${language}.ts`);

            fs.mkdirSync(pathDirname(filePath), { recursive: true });

@ -155,14 +152,14 @@ async function main() {
        });

        fs.writeFileSync(
-            pathJoin(messagesDirPath, "index.ts"),
+            pathJoin(baseMessagesDirPath, "index.ts"),
            Buffer.from(
                [
                    generatedFileHeader,
                    `import * as en from "./en";`,
                    "",
-                    "export async function fetchMessages_defaultSet(currentLanguageTag: string) {",
-                    "    const { default: messages_defaultSet } = await (() => {",
+                    "export async function getMessages(currentLanguageTag: string) {",
+                    "    const { default: messages } = await (() => {",
                    "        switch (currentLanguageTag) {",
                    `            case "en": return en;`,
                    ...languages
@ -174,7 +171,7 @@ async function main() {
                    '            default: return { "default": {} };',
                    "        }",
                    "    })();",
-                    "    return messages_defaultSet;",
+                    "    return messages;",
                    "}"
                ].join("\n"),
                "utf8"
--- a/scripts/link-in-app.ts
+++ b/scripts/link-in-app.ts
@ -44,12 +44,6 @@ const commonThirdPartyDeps = [
        .replace(/"!dist\//g, '"!')
        .replace(/"!\.\/dist\//g, '"!./');

-    modifiedPackageJsonContent = JSON.stringify(
-        { ...JSON.parse(modifiedPackageJsonContent), version: "0.0.0" },
-        null,
-        4
-    );
-
    fs.writeFileSync(
        pathJoin(rootDirPath, "dist", "package.json"),
        Buffer.from(modifiedPackageJsonContent, "utf8")
--- a/scripts/link-in-starter.ts
+++ b/scripts/link-in-starter.ts
@ -2,49 +2,22 @@ import * as child_process from "child_process";
 import * as fs from "fs";
 import { join } from "path";
 import { startRebuildOnSrcChange } from "./startRebuildOnSrcChange";
-import { crawl } from "../src/bin/tools/crawl";
-
-{
-    const dirPath = "node_modules";
-
-    try {
-        fs.rmSync(dirPath, { recursive: true, force: true });
-    } catch {
-        // NOTE: This is a workaround for windows
-        // we can't remove locked executables.
-
-        crawl({
-            dirPath,
-            returnedPathsType: "absolute"
-        }).forEach(filePath => {
-            try {
-                fs.rmSync(filePath, { force: true });
-            } catch (error) {
-                if (filePath.endsWith(".exe")) {
-                    return;
-                }
-                throw error;
-            }
-        });
-    }
-}

+fs.rmSync("node_modules", { recursive: true, force: true });
 fs.rmSync("dist", { recursive: true, force: true });
 fs.rmSync(".yarn_home", { recursive: true, force: true });

 run("yarn install");
 run("yarn build");

-const starterName = "keycloakify-starter";
-
-fs.rmSync(join("..", starterName, "node_modules"), {
+fs.rmSync(join("..", "keycloakify-starter", "node_modules"), {
    recursive: true,
    force: true
 });

-run("yarn install", { cwd: join("..", starterName) });
+run("yarn install", { cwd: join("..", "keycloakify-starter") });

-run(`npx tsx ${join("scripts", "link-in-app.ts")} ${starterName}`);
+run(`npx tsx ${join("scripts", "link-in-app.ts")} keycloakify-starter`);

 startRebuildOnSrcChange();

--- a/scripts/start-storybook.ts
+++ b/scripts/start-storybook.ts
@ -1,26 +1,30 @@
 import * as child_process from "child_process";
+import * as fs from "fs";
+import { join } from "path";
 import { startRebuildOnSrcChange } from "./startRebuildOnSrcChange";
-import { copyKeycloakResourcesToStorybookStaticDir } from "./copyKeycloakResourcesToStorybookStaticDir";

-(async () => {
-    run("yarn build");
+run("yarn build");

-    await copyKeycloakResourcesToStorybookStaticDir();
-
-    {
-        const child = child_process.spawn("npx", ["start-storybook", "-p", "6006"], {
-            shell: true
-        });
-
-        child.stdout.on("data", data => process.stdout.write(data));
-
-        child.stderr.on("data", data => process.stderr.write(data));
-
-        child.on("exit", process.exit.bind(process));
+run(`node ${join("dist", "bin", "main.js")} copy-keycloak-resources-to-public`, {
+    env: {
+        ...process.env,
+        PUBLIC_DIR_PATH: join(".storybook", "static")
    }
+});

-    startRebuildOnSrcChange();
-})();
+{
+    const child = child_process.spawn("npx", ["start-storybook", "-p", "6006"], {
+        shell: true
+    });
+
+    child.stdout.on("data", data => process.stdout.write(data));
+
+    child.stderr.on("data", data => process.stderr.write(data));
+
+    child.on("exit", process.exit.bind(process));
+}
+
+startRebuildOnSrcChange();

 function run(command: string, options?: { env?: NodeJS.ProcessEnv }) {
    console.log(`$ ${command}`);
--- a/src/PUBLIC_URL.ts
+++ b/src/PUBLIC_URL.ts
@ -1,4 +1,4 @@
-import { BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR } from "keycloakify/bin/shared/constants";
+import { basenameOfTheKeycloakifyResourcesDir } from "keycloakify/bin/shared/constants";
 import { assert } from "tsafe/assert";

 /**
@ -17,5 +17,5 @@ export const PUBLIC_URL = (() => {
        return process.env.PUBLIC_URL;
    }

-    return `${kcContext.url.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}`;
+    return `${kcContext.url.resourcesPath}/${basenameOfTheKeycloakifyResourcesDir}`;
 })();
--- a/src/account/KcContext/KcContext.ts
+++ b/src/account/KcContext/KcContext.ts
@ -118,10 +118,7 @@ export declare namespace KcContext {
            lastName?: string;
            username?: string;
        };
-        properties: {};
-        "x-keycloakify": {
-            messages: Record<string, string>;
-        };
+        properties: Record<string, string | undefined>;
    };

    export type Password = Common & {
--- a/src/account/KcContext/kcContextMocks.ts
+++ b/src/account/KcContext/kcContextMocks.ts
@ -1,10 +1,10 @@
 import "keycloakify/tools/Object.fromEntries";
-import { RESOURCES_COMMON, KEYCLOAK_RESOURCES } from "keycloakify/bin/shared/constants";
+import { resources_common, keycloak_resources } from "keycloakify/bin/shared/constants";
 import { id } from "tsafe/id";
 import type { KcContext } from "./KcContext";
 import { BASE_URL } from "keycloakify/lib/BASE_URL";

-const resourcesPath = `${BASE_URL}${KEYCLOAK_RESOURCES}/account/resources`;
+const resourcesPath = `${BASE_URL}${keycloak_resources}/account/resources`;

 export const kcContextCommonMock: KcContext.Common = {
    themeVersion: "0.0.0",
@ -13,7 +13,7 @@ export const kcContextCommonMock: KcContext.Common = {
    themeName: "my-theme-name",
    url: {
        resourcesPath,
-        resourcesCommonPath: `${resourcesPath}/${RESOURCES_COMMON}`,
+        resourcesCommonPath: `${resourcesPath}/${resources_common}`,
        resourceUrl: "#",
        accountUrl: "#",
        applicationsUrl: "#",
@ -82,10 +82,7 @@ export const kcContextCommonMock: KcContext.Common = {
        email: "john.doe@code.gouv.fr",
        username: "doe_j"
    },
-    properties: {},
-    "x-keycloakify": {
-        messages: {}
-    }
+    properties: {}
 };

 export const kcContextMocks: KcContext[] = [
--- a/src/account/Template.tsx
+++ b/src/account/Template.tsx
@ -145,12 +145,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
                        <div className={clsx("alert", `alert-${message.type}`)}>
                            {message.type === "success" && <span className="pficon pficon-ok"></span>}
                            {message.type === "error" && <span className="pficon pficon-error-circle-o"></span>}
-                            <span
-                                className="kc-feedback-text"
-                                dangerouslySetInnerHTML={{
-                                    __html: message.summary
-                                }}
-                            />
+                            <span className="kc-feedback-text">{message.summary}</span>
                        </div>
                    )}

--- a/src/account/i18n/GenericI18n.tsx
+++ b/src/account/i18n/GenericI18n.tsx
@ -1,6 +0,0 @@
-import type { GenericI18n_noJsx } from "./i18n";
-
-export type GenericI18n<MessageKey extends string> = GenericI18n_noJsx<MessageKey> & {
-    msg: (key: MessageKey, ...args: (string | undefined)[]) => JSX.Element;
-    advancedMsg: (key: string, ...args: (string | undefined)[]) => JSX.Element;
-};
--- a/src/account/i18n/i18n.tsx
+++ b/src/account/i18n/i18n.tsx
@ -1,24 +1,22 @@
 import "keycloakify/tools/Object.fromEntries";
 import { assert } from "tsafe/assert";
-import messages_defaultSet_fallbackLanguage from "./messages_defaultSet/en";
-import { fetchMessages_defaultSet } from "./messages_defaultSet";
+import messages_fallbackLanguage from "./baseMessages/en";
+import { getMessages } from "./baseMessages";
 import type { KcContext } from "../KcContext";
-import { FALLBACK_LANGUAGE_TAG } from "keycloakify/bin/shared/constants";
-import { id } from "tsafe/id";
+import { fallbackLanguageTag } from "keycloakify/bin/shared/constants";

 export type KcContextLike = {
    locale?: {
        currentLanguageTag: string;
        supported: { languageTag: string; url: string; label: string }[];
    };
-    "x-keycloakify": {
-        messages: Record<string, string>;
-    };
 };

 assert<KcContext extends KcContextLike ? true : false>();

-export type GenericI18n_noJsx<MessageKey extends string> = {
+export type MessageKey = keyof typeof messages_fallbackLanguage;
+
+export type GenericI18n<MessageKey extends string> = {
    /**
     * e.g: "en", "fr", "zh-CN"
     *
@ -38,21 +36,16 @@ export type GenericI18n_noJsx<MessageKey extends string> = {
     * */
    labelBySupportedLanguageTag: Record<string, string>;
    /**
-     *
     * Examples assuming currentLanguageTag === "en"
-     * {
-     *   en: {
-     *     "access-denied": "Access denied",
-     *     "impersonateTitleHtml": "<strong>{0}</strong> Impersonate User",
-     *     "bar": "Bar {0}"
-     *   }
-     * }
     *
-     * msgStr("access-denied") === "Access denied"
-     * msgStr("not-a-message-key") Throws an error
+     * msg("access-denied") === <span>Access denied</span>
+     * msg("impersonateTitleHtml", "Foo") === <span><strong>Foo</strong> Impersonate User</span>
+     */
+    msg: (key: MessageKey, ...args: (string | undefined)[]) => JSX.Element;
+    /**
+     * It's the same thing as msg() but instead of returning a JSX.Element it returns a string.
+     * It can be more convenient to manipulate strings but if there are HTML tags it wont render.
     * msgStr("impersonateTitleHtml", "Foo") === "<strong>Foo</strong> Impersonate User"
-     * msgStr("${bar}", "<strong>c</strong>") === "Bar &lt;strong&gt;XXX&lt;/strong&gt;"
-     *  The html in the arg is partially escaped for security reasons, it might come from an untrusted source, it's not safe to render it as html.
     */
    msgStr: (key: MessageKey, ...args: (string | undefined)[]) => string;
    /**
@ -63,11 +56,24 @@ export type GenericI18n_noJsx<MessageKey extends string> = {
     * {
     *   en: {
     *     "access-denied": "Access denied",
+     *     "foo": "Foo {0} {1}",
+     *     "bar": "Bar {0}"
     *   }
     * }
     *
-     * advancedMsgStr("${access-denied}") === advancedMsgStr("access-denied") === msgStr("access-denied") === "Access denied"
-     * advancedMsgStr("${not-a-message-key}") === advancedMsgStr("not-a-message-key") === "not-a-message-key"
+     * advancedMsg("${access-denied} foo bar") === <span>{msgStr("access-denied")} foo bar<span> === <span>Access denied foo bar</span>
+     * advancedMsg("${access-denied}") === advancedMsg("access-denied") === msg("access-denied") === <span>Access denied</span>
+     * advancedMsg("${not-a-message-key}") === advancedMsg(not-a-message-key") === <span>not-a-message-key</span>
+     * advancedMsg("${bar}", "<strong>c</strong>")
+     *    === <span>{msgStr("bar", "<strong>XXX</strong>")}<span>
+     *    === <span>Bar &lt;strong&gt;XXX&lt;/strong&gt;</span> (The html in the arg is partially escaped for security reasons, it might be untrusted)
+     * advancedMsg("${foo} xx ${bar}", "a", "b", "c")
+     *    === <span>{msgStr("foo", "a", "b")} xx {msgStr("bar")}<span>
+     *    === <span>Foo a b xx Bar {0}</span> (The substitution are only applied in the first message)
+     */
+    advancedMsg: (key: string, ...args: (string | undefined)[]) => JSX.Element;
+    /**
+     * See advancedMsg() but instead of returning a JSX.Element it returns a string.
     */
    advancedMsgStr: (key: string, ...args: (string | undefined)[]) => string;

@ -79,12 +85,10 @@ export type GenericI18n_noJsx<MessageKey extends string> = {
    isFetchingTranslations: boolean;
 };

-export type MessageKey_defaultSet = keyof typeof messages_defaultSet_fallbackLanguage;
-
-export function createGetI18n<MessageKey_themeDefined extends string = never>(messagesByLanguageTag_themeDefined: {
-    [languageTag: string]: { [key in MessageKey_themeDefined]: string };
+export function createGetI18n<ExtraMessageKey extends string = never>(messageBundle: {
+    [languageTag: string]: { [key in ExtraMessageKey]: string };
 }) {
-    type I18n = GenericI18n_noJsx<MessageKey_defaultSet | MessageKey_themeDefined>;
+    type I18n = GenericI18n<MessageKey | ExtraMessageKey>;

    type Result = { i18n: I18n; prI18n_currentLanguage: Promise<I18n> | undefined };

@ -104,7 +108,7 @@ export function createGetI18n<MessageKey_themeDefined extends string = never>(me
        }

        const partialI18n: Pick<I18n, "currentLanguageTag" | "getChangeLocaleUrl" | "labelBySupportedLanguageTag"> = {
-            currentLanguageTag: kcContext.locale?.currentLanguageTag ?? FALLBACK_LANGUAGE_TAG,
+            currentLanguageTag: kcContext.locale?.currentLanguageTag ?? fallbackLanguageTag,
            getChangeLocaleUrl: newLanguageTag => {
                const { locale } = kcContext;

@ -119,38 +123,30 @@ export function createGetI18n<MessageKey_themeDefined extends string = never>(me
            labelBySupportedLanguageTag: Object.fromEntries((kcContext.locale?.supported ?? []).map(({ languageTag, label }) => [languageTag, label]))
        };

-        const { createI18nTranslationFunctions } = createI18nTranslationFunctionsFactory<MessageKey_themeDefined>({
-            messages_themeDefined:
-                messagesByLanguageTag_themeDefined[partialI18n.currentLanguageTag] ??
-                messagesByLanguageTag_themeDefined[FALLBACK_LANGUAGE_TAG] ??
-                (() => {
-                    const firstLanguageTag = Object.keys(messagesByLanguageTag_themeDefined)[0];
-                    if (firstLanguageTag === undefined) {
-                        return undefined;
-                    }
-                    return messagesByLanguageTag_themeDefined[firstLanguageTag];
-                })(),
-            messages_fromKcServer: kcContext["x-keycloakify"].messages
+        const { createI18nTranslationFunctions } = createI18nTranslationFunctionsFactory<MessageKey, ExtraMessageKey>({
+            messages_fallbackLanguage,
+            messageBundle_fallbackLanguage: messageBundle[fallbackLanguageTag],
+            messageBundle_currentLanguage: messageBundle[partialI18n.currentLanguageTag]
        });

-        const isCurrentLanguageFallbackLanguage = partialI18n.currentLanguageTag === FALLBACK_LANGUAGE_TAG;
+        const isCurrentLanguageFallbackLanguage = partialI18n.currentLanguageTag === fallbackLanguageTag;

        const result: Result = {
            i18n: {
                ...partialI18n,
                ...createI18nTranslationFunctions({
-                    messages_defaultSet_currentLanguage: isCurrentLanguageFallbackLanguage ? messages_defaultSet_fallbackLanguage : undefined
+                    messages_currentLanguage: isCurrentLanguageFallbackLanguage ? messages_fallbackLanguage : undefined
                }),
                isFetchingTranslations: !isCurrentLanguageFallbackLanguage
            },
            prI18n_currentLanguage: isCurrentLanguageFallbackLanguage
                ? undefined
                : (async () => {
-                      const messages_defaultSet_currentLanguage = await fetchMessages_defaultSet(partialI18n.currentLanguageTag);
+                      const messages_currentLanguage = await getMessages(partialI18n.currentLanguageTag);

                      const i18n_currentLanguage: I18n = {
                          ...partialI18n,
-                          ...createI18nTranslationFunctions({ messages_defaultSet_currentLanguage }),
+                          ...createI18nTranslationFunctions({ messages_currentLanguage }),
                          isFetchingTranslations: false
                      };

@ -173,76 +169,118 @@ export function createGetI18n<MessageKey_themeDefined extends string = never>(me
    return { getI18n };
 }

-function createI18nTranslationFunctionsFactory<MessageKey_themeDefined extends string>(params: {
-    messages_themeDefined: Record<MessageKey_themeDefined, string> | undefined;
-    messages_fromKcServer: Record<string, string>;
+function createI18nTranslationFunctionsFactory<MessageKey extends string, ExtraMessageKey extends string>(params: {
+    messages_fallbackLanguage: Record<MessageKey, string>;
+    messageBundle_fallbackLanguage: Record<ExtraMessageKey, string> | undefined;
+    messageBundle_currentLanguage: Partial<Record<ExtraMessageKey, string>> | undefined;
 }) {
-    const { messages_themeDefined, messages_fromKcServer } = params;
+    const { messageBundle_currentLanguage } = params;
+
+    const messages_fallbackLanguage = {
+        ...params.messages_fallbackLanguage,
+        ...params.messageBundle_fallbackLanguage
+    };

    function createI18nTranslationFunctions(params: {
-        messages_defaultSet_currentLanguage: Partial<Record<MessageKey_defaultSet, string>> | undefined;
-    }): Pick<GenericI18n_noJsx<MessageKey_defaultSet | MessageKey_themeDefined>, "msgStr" | "advancedMsgStr"> {
-        const { messages_defaultSet_currentLanguage } = params;
+        messages_currentLanguage: Partial<Record<MessageKey, string>> | undefined;
+    }): Pick<GenericI18n<MessageKey | ExtraMessageKey>, "msg" | "msgStr" | "advancedMsg" | "advancedMsgStr"> {
+        const messages_currentLanguage = {
+            ...params.messages_currentLanguage,
+            ...messageBundle_currentLanguage
+        };

-        function resolveMsg(props: { key: string; args: (string | undefined)[] }): string | undefined {
-            const { key, args } = props;
+        function resolveMsg(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): string | JSX.Element | undefined {
+            const { key, args, doRenderAsHtml } = props;

-            const message =
-                id<Record<string, string | undefined>>(messages_fromKcServer)[key] ??
-                id<Record<string, string | undefined> | undefined>(messages_themeDefined)?.[key] ??
-                id<Record<string, string | undefined> | undefined>(messages_defaultSet_currentLanguage)?.[key] ??
-                id<Record<string, string | undefined>>(messages_defaultSet_fallbackLanguage)[key];
+            const messageOrUndefined: string | undefined = (messages_currentLanguage as any)[key] ?? (messages_fallbackLanguage as any)[key];

-            if (message === undefined) {
+            if (messageOrUndefined === undefined) {
                return undefined;
            }

-            const startIndex = message
-                .match(/{[0-9]+}/g)
-                ?.map(g => g.match(/{([0-9]+)}/)![1])
-                .map(indexStr => parseInt(indexStr))
-                .sort((a, b) => a - b)[0];
+            const message = messageOrUndefined;

-            if (startIndex === undefined) {
-                // No {0} in message (no arguments expected)
-                return message;
-            }
+            const messageWithArgsInjectedIfAny = (() => {
+                const startIndex = message
+                    .match(/{[0-9]+}/g)
+                    ?.map(g => g.match(/{([0-9]+)}/)![1])
+                    .map(indexStr => parseInt(indexStr))
+                    .sort((a, b) => a - b)[0];

-            let messageWithArgsInjected = message;
-
-            args.forEach((arg, i) => {
-                if (arg === undefined) {
-                    return;
+                if (startIndex === undefined) {
+                    // No {0} in message (no arguments expected)
+                    return message;
                }

-                messageWithArgsInjected = messageWithArgsInjected.replace(
-                    new RegExp(`\\{${i + startIndex}\\}`, "g"),
-                    arg.replace(/</g, "&lt;").replace(/>/g, "&gt;")
-                );
-            });
+                let messageWithArgsInjected = message;

-            return messageWithArgsInjected;
+                args.forEach((arg, i) => {
+                    if (arg === undefined) {
+                        return;
+                    }
+
+                    messageWithArgsInjected = messageWithArgsInjected.replace(
+                        new RegExp(`\\{${i + startIndex}\\}`, "g"),
+                        arg.replace(/</g, "&lt;").replace(/>/g, "&gt;")
+                    );
+                });
+
+                return messageWithArgsInjected;
+            })();
+
+            return doRenderAsHtml ? (
+                <span
+                    // NOTE: The message is trusted. The arguments are not but are escaped.
+                    dangerouslySetInnerHTML={{
+                        __html: messageWithArgsInjectedIfAny
+                    }}
+                />
+            ) : (
+                messageWithArgsInjectedIfAny
+            );
        }

-        function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[] }): string {
-            const { key, args } = props;
+        function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): JSX.Element | string {
+            const { key, args, doRenderAsHtml } = props;

-            const match = key.match(/^\$\{(.+)\}$/);
+            if (!/\$\{[^}]+\}/.test(key)) {
+                const resolvedMessage = resolveMsg({ key, args, doRenderAsHtml });

-            if (match === null) {
-                return key;
+                if (resolvedMessage === undefined) {
+                    return doRenderAsHtml ? <span dangerouslySetInnerHTML={{ __html: key }} /> : key;
+                }
+
+                return resolvedMessage;
            }

-            return resolveMsg({ key: match[1], args }) ?? key;
+            let isFirstMatch = true;
+
+            const resolvedComplexMessage = key.replace(/\$\{([^}]+)\}/g, (...[, key_i]) => {
+                const replaceBy = resolveMsg({ key: key_i, args: isFirstMatch ? args : [], doRenderAsHtml: false }) ?? key_i;
+
+                isFirstMatch = false;
+
+                return replaceBy;
+            });
+
+            return doRenderAsHtml ? <span dangerouslySetInnerHTML={{ __html: resolvedComplexMessage }} /> : resolvedComplexMessage;
        }

        return {
-            msgStr: (key, ...args) => {
-                const resolvedMessage = resolveMsg({ key, args });
-                assert(resolvedMessage !== undefined, `Message with key "${key}" not found`);
-                return resolvedMessage;
-            },
-            advancedMsgStr: (key, ...args) => resolveMsgAdvanced({ key, args })
+            msgStr: (key, ...args) => resolveMsg({ key, args, doRenderAsHtml: false }) as string,
+            msg: (key, ...args) => resolveMsg({ key, args, doRenderAsHtml: true }) as JSX.Element,
+            advancedMsg: (key, ...args) =>
+                resolveMsgAdvanced({
+                    key,
+                    args,
+                    doRenderAsHtml: true
+                }) as JSX.Element,
+            advancedMsgStr: (key, ...args) =>
+                resolveMsgAdvanced({
+                    key,
+                    args,
+                    doRenderAsHtml: false
+                }) as string
        };
    }

--- a/src/account/i18n/index.ts
+++ b/src/account/i18n/index.ts
@ -1,5 +1,4 @@
-import type { GenericI18n } from "./GenericI18n";
-import type { MessageKey_defaultSet, KcContextLike } from "./i18n";
-export type { MessageKey_defaultSet, KcContextLike };
-export type I18n = GenericI18n<MessageKey_defaultSet>;
+import type { GenericI18n, MessageKey, KcContextLike } from "./i18n";
+export type { MessageKey, KcContextLike };
+export type I18n = GenericI18n<MessageKey>;
 export { createUseI18n } from "./useI18n";
--- a/src/account/i18n/useI18n.ts
+++ b/src/account/i18n/useI18n.ts
@ -0,0 +1,44 @@
+import { useEffect, useState } from "react";
+import {
+    createGetI18n,
+    type GenericI18n,
+    type MessageKey,
+    type KcContextLike
+} from "./i18n";
+import { Reflect } from "tsafe/Reflect";
+
+export function createUseI18n<ExtraMessageKey extends string = never>(messageBundle: {
+    [languageTag: string]: { [key in ExtraMessageKey]: string };
+}) {
+    type I18n = GenericI18n<MessageKey | ExtraMessageKey>;
+
+    const { getI18n } = createGetI18n(messageBundle);
+
+    function useI18n(params: { kcContext: KcContextLike }): { i18n: I18n } {
+        const { kcContext } = params;
+
+        const { i18n, prI18n_currentLanguage } = getI18n({ kcContext });
+
+        const [i18n_toReturn, setI18n_toReturn] = useState<I18n>(i18n);
+
+        useEffect(() => {
+            let isActive = true;
+
+            prI18n_currentLanguage?.then(i18n => {
+                if (!isActive) {
+                    return;
+                }
+
+                setI18n_toReturn(i18n);
+            });
+
+            return () => {
+                isActive = false;
+            };
+        }, []);
+
+        return { i18n: i18n_toReturn };
+    }
+
+    return { useI18n, ofTypeI18n: Reflect<I18n>() };
+}
--- a/src/account/i18n/useI18n.tsx
+++ b/src/account/i18n/useI18n.tsx
@ -1,95 +0,0 @@
-import { useEffect, useState } from "react";
-import { createGetI18n, type GenericI18n_noJsx, type KcContextLike, type MessageKey_defaultSet } from "./i18n";
-import { GenericI18n } from "./GenericI18n";
-import { Reflect } from "tsafe/Reflect";
-
-export function createUseI18n<MessageKey_themeDefined extends string = never>(messagesByLanguageTag: {
-    [languageTag: string]: { [key in MessageKey_themeDefined]: string };
-}) {
-    type MessageKey = MessageKey_defaultSet | MessageKey_themeDefined;
-
-    type I18n = GenericI18n<MessageKey>;
-
-    const { withJsx } = (() => {
-        const cache = new WeakMap<GenericI18n_noJsx<MessageKey>, GenericI18n<MessageKey>>();
-
-        function renderHtmlString(params: { htmlString: string; msgKey: string }): JSX.Element {
-            const { htmlString, msgKey } = params;
-            return (
-                <div
-                    data-kc-msg={msgKey}
-                    dangerouslySetInnerHTML={{
-                        __html: htmlString
-                    }}
-                />
-            );
-        }
-
-        function withJsx(i18n_noJsx: GenericI18n_noJsx<MessageKey>): I18n {
-            use_cache: {
-                const i18n = cache.get(i18n_noJsx);
-
-                if (i18n === undefined) {
-                    break use_cache;
-                }
-
-                return i18n;
-            }
-
-            const i18n: I18n = {
-                ...i18n_noJsx,
-                msg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.msgStr(msgKey, ...args), msgKey }),
-                advancedMsg: (msgKey, ...args) => renderHtmlString({ htmlString: i18n_noJsx.advancedMsgStr(msgKey, ...args), msgKey })
-            };
-
-            cache.set(i18n_noJsx, i18n);
-
-            return i18n;
-        }
-
-        return { withJsx };
-    })();
-
-    add_style: {
-        const attributeName = "data-kc-i18n";
-
-        // Check if already exists in head
-        if (document.querySelector(`style[${attributeName}]`) !== null) {
-            break add_style;
-        }
-
-        const styleElement = document.createElement("style");
-        styleElement.attributes.setNamedItem(document.createAttribute(attributeName));
-        (styleElement.textContent = `[data-kc-msg] { display: inline-block; }`), document.head.prepend(styleElement);
-    }
-
-    const { getI18n } = createGetI18n(messagesByLanguageTag);
-
-    function useI18n(params: { kcContext: KcContextLike }): { i18n: I18n } {
-        const { kcContext } = params;
-
-        const { i18n, prI18n_currentLanguage } = getI18n({ kcContext });
-
-        const [i18n_toReturn, setI18n_toReturn] = useState<I18n>(withJsx(i18n));
-
-        useEffect(() => {
-            let isActive = true;
-
-            prI18n_currentLanguage?.then(i18n => {
-                if (!isActive) {
-                    return;
-                }
-
-                setI18n_toReturn(withJsx(i18n));
-            });
-
-            return () => {
-                isActive = false;
-            };
-        }, []);
-
-        return { i18n: i18n_toReturn };
-    }
-
-    return { useI18n, ofTypeI18n: Reflect<I18n>() };
-}
--- a/src/account/pages/Applications.tsx
+++ b/src/account/pages/Applications.tsx
@ -62,6 +62,7 @@ export default function Applications(props: PageProps<Extract<KcContext, { pageI
                                                    {index < application.realmRolesAvailable.length - 1 && ", "}
                                                </span>
                                            ))}
+                                        {!isArrayWithEmptyObject(application.realmRolesAvailable) && application.resourceRolesAvailable && ", "}
                                        {application.resourceRolesAvailable &&
                                            Object.keys(application.resourceRolesAvailable).map(resource => (
                                                <span key={resource}>
--- a/src/account/pages/FederatedIdentity.tsx
+++ b/src/account/pages/FederatedIdentity.tsx
@ -8,7 +8,7 @@ export default function FederatedIdentity(props: PageProps<Extract<KcContext, {
    const { url, federatedIdentity, stateChecker } = kcContext;
    const { msg } = i18n;
    return (
-        <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} active="social">
+        <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} active="federatedIdentity">
            <div className="main-layout social">
                <div className="row">
                    <div className="col-md-10">
--- a/src/account/pages/Totp.tsx
+++ b/src/account/pages/Totp.tsx
@ -154,14 +154,9 @@ export default function Totp(props: PageProps<Extract<KcContext, { pageId: "totp
                                    />

                                    {messagesPerField.existsError("totp") && (
-                                        <span
-                                            id="input-error-otp-code"
-                                            className={kcClsx("kcInputErrorMessageClass")}
-                                            aria-live="polite"
-                                            dangerouslySetInnerHTML={{
-                                                __html: messagesPerField.get("totp")
-                                            }}
-                                        />
+                                        <span id="input-error-otp-code" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                            {messagesPerField.get("totp")}
+                                        </span>
                                    )}
                                </div>
                                <input type="hidden" id="totpSecret" name="totpSecret" value={totp.totpSecret} />
@ -185,14 +180,9 @@ export default function Totp(props: PageProps<Extract<KcContext, { pageId: "totp
                                        aria-invalid={messagesPerField.existsError("userLabel")}
                                    />
                                    {messagesPerField.existsError("userLabel") && (
-                                        <span
-                                            id="input-error-otp-label"
-                                            className={kcClsx("kcInputErrorMessageClass")}
-                                            aria-live="polite"
-                                            dangerouslySetInnerHTML={{
-                                                __html: messagesPerField.get("userLabel")
-                                            }}
-                                        />
+                                        <span id="input-error-otp-label" className={kcClsx("kcInputErrorMessageClass")} aria-live="polite">
+                                            {messagesPerField.get("userLabel")}
+                                        </span>
                                    )}
                                </div>
                            </div>
--- a/src/bin/add-story.ts
+++ b/src/bin/add-story.ts
@ -1,11 +1,11 @@
 import { getThisCodebaseRootDirPath } from "./tools/getThisCodebaseRootDirPath";
 import cliSelect from "cli-select";
 import {
-    LOGIN_THEME_PAGE_IDS,
-    ACCOUNT_THEME_PAGE_IDS,
+    loginThemePageIds,
+    accountThemePageIds,
    type LoginThemePageId,
    type AccountThemePageId,
-    THEME_TYPES,
+    themeTypes,
    type ThemeType
 } from "./shared/constants";
 import { capitalize } from "tsafe/capitalize";
@ -26,43 +26,11 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })

    console.log(chalk.cyan("Theme type:"));

-    const themeType = await (async () => {
-        const values = THEME_TYPES.filter(themeType => {
-            switch (themeType) {
-                case "account":
-                    return buildContext.implementedThemeTypes.account.isImplemented;
-                case "login":
-                    return buildContext.implementedThemeTypes.login.isImplemented;
-            }
-            assert<Equals<typeof themeType, never>>(false);
-        });
-
-        assert(values.length > 0, "No theme is implemented in this project");
-
-        if (values.length === 1) {
-            return values[0];
-        }
-
-        const { value } = await cliSelect<ThemeType>({
-            values
-        }).catch(() => {
-            process.exit(-1);
-        });
-
-        return value;
-    })();
-
-    if (
-        themeType === "account" &&
-        (assert(buildContext.implementedThemeTypes.account.isImplemented),
-        buildContext.implementedThemeTypes.account.type === "Single-Page")
-    ) {
-        console.log(
-            `${chalk.red("✗")} Sorry, there is no Storybook support for Single-Page Account themes.`
-        );
-
-        process.exit(0);
-    }
+    const { value: themeType } = await cliSelect<ThemeType>({
+        values: [...themeTypes]
+    }).catch(() => {
+        process.exit(-1);
+    });

    console.log(`→ ${themeType}`);

@ -72,9 +40,9 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
        values: (() => {
            switch (themeType) {
                case "login":
-                    return [...LOGIN_THEME_PAGE_IDS];
+                    return [...loginThemePageIds];
                case "account":
-                    return [...ACCOUNT_THEME_PAGE_IDS];
+                    return [...accountThemePageIds];
            }
            assert<Equals<typeof themeType, never>>(false);
        })()
@ -113,8 +81,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
            )
        )
        .toString("utf8")
-        .replace('import React from "react";\n', "")
-        .replace(/from "[./]+dist\//, 'from "keycloakify/');
+        .replace('import React from "react";\n', "");

    {
        const targetDirPath = pathDirname(targetFilePath);
--- a/src/bin/eject-page.ts
+++ b/src/bin/eject-page.ts
@ -3,21 +3,16 @@
 import { getThisCodebaseRootDirPath } from "./tools/getThisCodebaseRootDirPath";
 import cliSelect from "cli-select";
 import {
-    LOGIN_THEME_PAGE_IDS,
-    ACCOUNT_THEME_PAGE_IDS,
+    loginThemePageIds,
+    accountThemePageIds,
    type LoginThemePageId,
    type AccountThemePageId,
-    THEME_TYPES,
+    themeTypes,
    type ThemeType
 } from "./shared/constants";
 import { capitalize } from "tsafe/capitalize";
 import * as fs from "fs";
-import {
-    join as pathJoin,
-    relative as pathRelative,
-    dirname as pathDirname,
-    basename as pathBasename
-} from "path";
+import { join as pathJoin, relative as pathRelative, dirname as pathDirname } from "path";
 import { kebabCaseToCamelCase } from "./tools/kebabCaseToSnakeCase";
 import { assert, Equals } from "tsafe/assert";
 import type { CliCommandOptions } from "./main";
@ -33,114 +28,11 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })

    console.log(chalk.cyan("Theme type:"));

-    const themeType = await (async () => {
-        const values = THEME_TYPES.filter(themeType => {
-            switch (themeType) {
-                case "account":
-                    return buildContext.implementedThemeTypes.account.isImplemented;
-                case "login":
-                    return buildContext.implementedThemeTypes.login.isImplemented;
-            }
-            assert<Equals<typeof themeType, never>>(false);
-        });
-
-        assert(values.length > 0, "No theme is implemented in this project");
-
-        if (values.length === 1) {
-            return values[0];
-        }
-
-        const { value } = await cliSelect<ThemeType>({
-            values
-        }).catch(() => {
-            process.exit(-1);
-        });
-
-        return value;
-    })();
-
-    if (
-        themeType === "account" &&
-        (assert(buildContext.implementedThemeTypes.account.isImplemented),
-        buildContext.implementedThemeTypes.account.type === "Single-Page")
-    ) {
-        const srcDirPath = pathJoin(
-            pathDirname(buildContext.packageJsonFilePath),
-            "node_modules",
-            "@keycloakify",
-            "keycloak-account-ui",
-            "src"
-        );
-
-        console.log(
-            [
-                `There isn't an interactive CLI to eject components of the Single-Page Account theme.`,
-                `You can however copy paste into your codebase the any file or directory from the following source directory:`,
-                ``,
-                `${chalk.bold(pathJoin(pathRelative(process.cwd(), srcDirPath)))}`,
-                ``
-            ].join("\n")
-        );
-
-        eject_entrypoint: {
-            const kcAccountUiTsxFileRelativePath = "KcAccountUi.tsx";
-
-            const accountThemeSrcDirPath = pathJoin(
-                buildContext.themeSrcDirPath,
-                "account"
-            );
-
-            const targetFilePath = pathJoin(
-                accountThemeSrcDirPath,
-                kcAccountUiTsxFileRelativePath
-            );
-
-            if (fs.existsSync(targetFilePath)) {
-                break eject_entrypoint;
-            }
-
-            fs.cpSync(
-                pathJoin(srcDirPath, kcAccountUiTsxFileRelativePath),
-                targetFilePath
-            );
-
-            {
-                const kcPageTsxFilePath = pathJoin(accountThemeSrcDirPath, "KcPage.tsx");
-
-                const kcPageTsxCode = fs.readFileSync(kcPageTsxFilePath).toString("utf8");
-
-                const componentName = pathBasename(
-                    kcAccountUiTsxFileRelativePath
-                ).replace(/.tsx$/, "");
-
-                const modifiedKcPageTsxCode = kcPageTsxCode.replace(
-                    `@keycloakify/keycloak-account-ui/${componentName}`,
-                    `./${componentName}`
-                );
-
-                fs.writeFileSync(
-                    kcPageTsxFilePath,
-                    Buffer.from(modifiedKcPageTsxCode, "utf8")
-                );
-            }
-
-            const routesTsxFilePath = pathRelative(
-                process.cwd(),
-                pathJoin(srcDirPath, "routes.tsx")
-            );
-
-            console.log(
-                [
-                    `To help you get started ${chalk.bold(pathRelative(process.cwd(), targetFilePath))} has been copied into your project.`,
-                    `The next step is usually to eject ${chalk.bold(routesTsxFilePath)}`,
-                    `with \`cp ${routesTsxFilePath} ${pathRelative(process.cwd(), accountThemeSrcDirPath)}\``,
-                    `then update the import of routes in ${kcAccountUiTsxFileRelativePath}.`
-                ].join("\n")
-            );
-        }
-
-        process.exit(0);
-    }
+    const { value: themeType } = await cliSelect<ThemeType>({
+        values: [...themeTypes]
+    }).catch(() => {
+        process.exit(-1);
+    });

    console.log(`→ ${themeType}`);

@ -162,10 +54,10 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                    return [
                        templateValue,
                        userProfileFormFieldsValue,
-                        ...LOGIN_THEME_PAGE_IDS
+                        ...loginThemePageIds
                    ];
                case "account":
-                    return [templateValue, ...ACCOUNT_THEME_PAGE_IDS];
+                    return [templateValue, ...accountThemePageIds];
            }
            assert<Equals<typeof themeType, never>>(false);
        })()
--- a/src/bin/initialize-account-theme/copyBoilerplate.ts
+++ b/src/bin/initialize-account-theme/copyBoilerplate.ts
@ -1,32 +0,0 @@
-import * as fs from "fs";
-import { join as pathJoin } from "path";
-import { getThisCodebaseRootDirPath } from "../tools/getThisCodebaseRootDirPath";
-import { assert, type Equals } from "tsafe/assert";
-
-export function copyBoilerplate(params: {
-    accountThemeType: "Single-Page" | "Multi-Page";
-    accountThemeSrcDirPath: string;
-}) {
-    const { accountThemeType, accountThemeSrcDirPath } = params;
-
-    fs.cpSync(
-        pathJoin(
-            getThisCodebaseRootDirPath(),
-            "src",
-            "bin",
-            "initialize-account-theme",
-            "src",
-            (() => {
-                switch (accountThemeType) {
-                    case "Single-Page":
-                        return "single-page";
-                    case "Multi-Page":
-                        return "multi-page";
-                }
-                assert<Equals<typeof accountThemeType, never>>(false);
-            })()
-        ),
-        accountThemeSrcDirPath,
-        { recursive: true }
-    );
-}
--- a/src/bin/initialize-account-theme/index.ts
+++ b/src/bin/initialize-account-theme/index.ts
@ -1 +0,0 @@
-export * from "./initialize-account-theme";
--- a/src/bin/initialize-account-theme/initialize-account-theme.ts
+++ b/src/bin/initialize-account-theme/initialize-account-theme.ts
@ -1,112 +0,0 @@
-import { getBuildContext } from "../shared/buildContext";
-import type { CliCommandOptions } from "../main";
-import cliSelect from "cli-select";
-import child_process from "child_process";
-import chalk from "chalk";
-import { join as pathJoin, relative as pathRelative } from "path";
-import * as fs from "fs";
-import { updateAccountThemeImplementationInConfig } from "./updateAccountThemeImplementationInConfig";
-import { generateKcGenTs } from "../shared/generateKcGenTs";
-
-export async function command(params: { cliCommandOptions: CliCommandOptions }) {
-    const { cliCommandOptions } = params;
-
-    const buildContext = getBuildContext({ cliCommandOptions });
-
-    const accountThemeSrcDirPath = pathJoin(buildContext.themeSrcDirPath, "account");
-
-    if (
-        fs.existsSync(accountThemeSrcDirPath) &&
-        fs.readdirSync(accountThemeSrcDirPath).length > 0
-    ) {
-        console.warn(
-            chalk.red(
-                `There is already a ${pathRelative(
-                    process.cwd(),
-                    accountThemeSrcDirPath
-                )} directory in your project. Aborting.`
-            )
-        );
-
-        process.exit(-1);
-    }
-
-    exit_if_uncommitted_changes: {
-        let hasUncommittedChanges: boolean | undefined = undefined;
-
-        try {
-            hasUncommittedChanges =
-                child_process
-                    .execSync(`git status --porcelain`, {
-                        cwd: buildContext.projectDirPath
-                    })
-                    .toString()
-                    .trim() !== "";
-        } catch {
-            // Probably not a git repository
-            break exit_if_uncommitted_changes;
-        }
-
-        if (!hasUncommittedChanges) {
-            break exit_if_uncommitted_changes;
-        }
-        console.warn(
-            [
-                chalk.red(
-                    "Please commit or stash your changes before running this command.\n"
-                ),
-                "This command will modify your project's files so it's better to have a clean working directory",
-                "so that you can easily see what has been changed and revert if needed."
-            ].join(" ")
-        );
-
-        process.exit(-1);
-    }
-
-    const { value: accountThemeType } = await cliSelect({
-        values: ["Single-Page" as const, "Multi-Page" as const]
-    }).catch(() => {
-        process.exit(-1);
-    });
-
-    switch (accountThemeType) {
-        case "Multi-Page":
-            {
-                const { initializeAccountTheme_multiPage } = await import(
-                    "./initializeAccountTheme_multiPage"
-                );
-
-                await initializeAccountTheme_multiPage({
-                    accountThemeSrcDirPath
-                });
-            }
-            break;
-        case "Single-Page":
-            {
-                const { initializeAccountTheme_singlePage } = await import(
-                    "./initializeAccountTheme_singlePage"
-                );
-
-                await initializeAccountTheme_singlePage({
-                    accountThemeSrcDirPath,
-                    buildContext
-                });
-            }
-            break;
-    }
-
-    updateAccountThemeImplementationInConfig({ buildContext, accountThemeType });
-
-    await generateKcGenTs({
-        buildContext: {
-            ...buildContext,
-            implementedThemeTypes: {
-                ...buildContext.implementedThemeTypes,
-                account: {
-                    isImplemented: true,
-                    type: accountThemeType
-                }
-            }
-        }
-    });
-}
--- a/src/bin/initialize-account-theme/initializeAccountTheme_multiPage.ts
+++ b/src/bin/initialize-account-theme/initializeAccountTheme_multiPage.ts
@ -1,21 +0,0 @@
-import { relative as pathRelative } from "path";
-import chalk from "chalk";
-import { copyBoilerplate } from "./copyBoilerplate";
-
-export async function initializeAccountTheme_multiPage(params: {
-    accountThemeSrcDirPath: string;
-}) {
-    const { accountThemeSrcDirPath } = params;
-
-    copyBoilerplate({
-        accountThemeType: "Multi-Page",
-        accountThemeSrcDirPath
-    });
-
-    console.log(
-        [
-            chalk.green("The Multi-Page account theme has been initialized."),
-            `Directory created: ${chalk.bold(pathRelative(process.cwd(), accountThemeSrcDirPath))}`
-        ].join("\n")
-    );
-}
--- a/src/bin/initialize-account-theme/initializeAccountTheme_singlePage.ts
+++ b/src/bin/initialize-account-theme/initializeAccountTheme_singlePage.ts
@ -1,152 +0,0 @@
-import { join as pathJoin, relative as pathRelative, dirname as pathDirname } from "path";
-import type { BuildContext } from "../shared/buildContext";
-import * as fs from "fs";
-import chalk from "chalk";
-import {
-    getLatestsSemVersionedTag,
-    type BuildContextLike as BuildContextLike_getLatestsSemVersionedTag
-} from "../shared/getLatestsSemVersionedTag";
-import fetch from "make-fetch-happen";
-import { z } from "zod";
-import { assert, type Equals } from "tsafe/assert";
-import { is } from "tsafe/is";
-import { id } from "tsafe/id";
-import { npmInstall } from "../tools/npmInstall";
-import { copyBoilerplate } from "./copyBoilerplate";
-import { getThisCodebaseRootDirPath } from "../tools/getThisCodebaseRootDirPath";
-
-type BuildContextLike = BuildContextLike_getLatestsSemVersionedTag & {
-    fetchOptions: BuildContext["fetchOptions"];
-    packageJsonFilePath: string;
-};
-
-assert<BuildContext extends BuildContextLike ? true : false>();
-
-export async function initializeAccountTheme_singlePage(params: {
-    accountThemeSrcDirPath: string;
-    buildContext: BuildContextLike;
-}) {
-    const { accountThemeSrcDirPath, buildContext } = params;
-
-    const OWNER = "keycloakify";
-    const REPO = "keycloak-account-ui";
-
-    const [semVersionedTag] = await getLatestsSemVersionedTag({
-        owner: OWNER,
-        repo: REPO,
-        count: 1,
-        doIgnoreReleaseCandidates: false,
-        buildContext
-    });
-
-    const dependencies = await fetch(
-        `https://raw.githubusercontent.com/${OWNER}/${REPO}/${semVersionedTag.tag}/dependencies.gen.json`,
-        buildContext.fetchOptions
-    )
-        .then(r => r.json())
-        .then(
-            (() => {
-                type Dependencies = {
-                    dependencies: Record<string, string>;
-                    devDependencies?: Record<string, string>;
-                };
-
-                const zDependencies = (() => {
-                    type TargetType = Dependencies;
-
-                    const zTargetType = z.object({
-                        dependencies: z.record(z.string()),
-                        devDependencies: z.record(z.string()).optional()
-                    });
-
-                    assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-                    return id<z.ZodType<TargetType>>(zTargetType);
-                })();
-
-                return o => zDependencies.parse(o);
-            })()
-        );
-
-    dependencies.dependencies["@keycloakify/keycloak-account-ui"] = semVersionedTag.tag;
-
-    const parsedPackageJson = (() => {
-        type ParsedPackageJson = {
-            dependencies?: Record<string, string>;
-            devDependencies?: Record<string, string>;
-        };
-
-        const zParsedPackageJson = (() => {
-            type TargetType = ParsedPackageJson;
-
-            const zTargetType = z.object({
-                dependencies: z.record(z.string()).optional(),
-                devDependencies: z.record(z.string()).optional()
-            });
-
-            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-            return id<z.ZodType<TargetType>>(zTargetType);
-        })();
-        const parsedPackageJson = JSON.parse(
-            fs.readFileSync(buildContext.packageJsonFilePath).toString("utf8")
-        );
-
-        zParsedPackageJson.parse(parsedPackageJson);
-
-        assert(is<ParsedPackageJson>(parsedPackageJson));
-
-        return parsedPackageJson;
-    })();
-
-    parsedPackageJson.dependencies = {
-        ...parsedPackageJson.dependencies,
-        ...dependencies.dependencies
-    };
-
-    parsedPackageJson.devDependencies = {
-        ...parsedPackageJson.devDependencies,
-        ...dependencies.devDependencies
-    };
-
-    if (Object.keys(parsedPackageJson.devDependencies).length === 0) {
-        delete parsedPackageJson.devDependencies;
-    }
-
-    fs.writeFileSync(
-        buildContext.packageJsonFilePath,
-        JSON.stringify(parsedPackageJson, undefined, 4)
-    );
-
-    run_npm_install: {
-        if (
-            JSON.parse(
-                fs
-                    .readFileSync(pathJoin(getThisCodebaseRootDirPath(), "package.json"))
-                    .toString("utf8")
-            )["version"] === "0.0.0"
-        ) {
-            //NOTE: Linked version
-            break run_npm_install;
-        }
-
-        npmInstall({ packageJsonDirPath: pathDirname(buildContext.packageJsonFilePath) });
-    }
-
-    copyBoilerplate({
-        accountThemeType: "Single-Page",
-        accountThemeSrcDirPath
-    });
-
-    console.log(
-        [
-            chalk.green(
-                "The Single-Page account theme has been successfully initialized."
-            ),
-            `Using Account UI of Keycloak version: ${chalk.bold(semVersionedTag.tag.split("-")[0])}`,
-            `Directory created: ${chalk.bold(pathRelative(process.cwd(), accountThemeSrcDirPath))}`,
-            `Dependencies added to your project's package.json: `,
-            chalk.bold(JSON.stringify(dependencies, null, 2))
-        ].join("\n")
-    );
-}
--- a/src/bin/initialize-account-theme/src/multi-page/KcContext.ts
+++ b/src/bin/initialize-account-theme/src/multi-page/KcContext.ts
@ -1,12 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-types */
-import type { ExtendKcContext } from "keycloakify/account";
-import type { KcEnvName, ThemeName } from "../kc.gen";
-
-export type KcContextExtension = {
-    themeName: ThemeName;
-    properties: Record<KcEnvName, string> & {};
-};
-
-export type KcContextExtensionPerPage = {};
-
-export type KcContext = ExtendKcContext<KcContextExtension, KcContextExtensionPerPage>;
--- a/src/bin/initialize-account-theme/src/multi-page/KcPage.tsx
+++ b/src/bin/initialize-account-theme/src/multi-page/KcPage.tsx
@ -1,25 +0,0 @@
-import { Suspense } from "react";
-import type { ClassKey } from "keycloakify/account";
-import type { KcContext } from "./KcContext";
-import { useI18n } from "./i18n";
-import DefaultPage from "keycloakify/account/DefaultPage";
-import Template from "keycloakify/account/Template";
-
-export default function KcPage(props: { kcContext: KcContext }) {
-    const { kcContext } = props;
-
-    const { i18n } = useI18n({ kcContext });
-
-    return (
-        <Suspense>
-            {(() => {
-                switch (kcContext.pageId) {
-                    default:
-                        return <DefaultPage kcContext={kcContext} i18n={i18n} classes={classes} Template={Template} doUseDefaultCss={true} />;
-                }
-            })()}
-        </Suspense>
-    );
-}
-
-const classes = {} satisfies { [key in ClassKey]?: string };
--- a/src/bin/initialize-account-theme/src/multi-page/KcPageStory.tsx
+++ b/src/bin/initialize-account-theme/src/multi-page/KcPageStory.tsx
@ -1,38 +0,0 @@
-import type { DeepPartial } from "keycloakify/tools/DeepPartial";
-import type { KcContext } from "./KcContext";
-import { createGetKcContextMock } from "keycloakify/account/KcContext";
-import type { KcContextExtension, KcContextExtensionPerPage } from "./KcContext";
-import KcPage from "./KcPage";
-import { themeNames, kcEnvDefaults } from "../kc.gen";
-
-const kcContextExtension: KcContextExtension = {
-    themeName: themeNames[0],
-    properties: {
-        ...kcEnvDefaults
-    }
-};
-const kcContextExtensionPerPage: KcContextExtensionPerPage = {};
-
-export const { getKcContextMock } = createGetKcContextMock({
-    kcContextExtension,
-    kcContextExtensionPerPage,
-    overrides: {},
-    overridesPerPage: {}
-});
-
-export function createKcPageStory<PageId extends KcContext["pageId"]>(params: { pageId: PageId }) {
-    const { pageId } = params;
-
-    function KcPageStory(props: { kcContext?: DeepPartial<Extract<KcContext, { pageId: PageId }>> }) {
-        const { kcContext: overrides } = props;
-
-        const kcContextMock = getKcContextMock({
-            pageId,
-            overrides
-        });
-
-        return <KcPage kcContext={kcContextMock} />;
-    }
-
-    return { KcPageStory };
-}
--- a/src/bin/initialize-account-theme/src/multi-page/i18n.ts
+++ b/src/bin/initialize-account-theme/src/multi-page/i18n.ts
@ -1,5 +0,0 @@
-import { createUseI18n } from "keycloakify/account";
-
-export const { useI18n, ofTypeI18n } = createUseI18n({});
-
-export type I18n = typeof ofTypeI18n;
--- a/src/bin/initialize-account-theme/src/single-page/KcContext.ts
+++ b/src/bin/initialize-account-theme/src/single-page/KcContext.ts
@ -1,7 +0,0 @@
-import type { KcContextLike } from "@keycloakify/keycloak-account-ui";
-import type { KcEnvName } from "../kc.gen";
-
-export type KcContext = KcContextLike & {
-    themeType: "account";
-    properties: Record<KcEnvName, string>;
-};
--- a/src/bin/initialize-account-theme/src/single-page/KcPage.tsx
+++ b/src/bin/initialize-account-theme/src/single-page/KcPage.tsx
@ -1,11 +0,0 @@
-import { lazy } from "react";
-import { KcAccountUiLoader } from "@keycloakify/keycloak-account-ui";
-import type { KcContext } from "./KcContext";
-
-const KcAccountUi = lazy(() => import("@keycloakify/keycloak-account-ui/KcAccountUi"));
-
-export default function KcPage(props: { kcContext: KcContext }) {
-    const { kcContext } = props;
-
-    return <KcAccountUiLoader kcContext={kcContext} KcAccountUi={KcAccountUi} />;
-}
--- a/src/bin/initialize-account-theme/updateAccountThemeImplementationInConfig.ts
+++ b/src/bin/initialize-account-theme/updateAccountThemeImplementationInConfig.ts
@ -1,92 +0,0 @@
-import { join as pathJoin } from "path";
-import { assert, type Equals } from "tsafe/assert";
-import type { BuildContext } from "../shared/buildContext";
-import * as fs from "fs";
-import chalk from "chalk";
-import { z } from "zod";
-import { id } from "tsafe/id";
-
-export type BuildContextLike = {
-    bundler: BuildContext["bundler"];
-};
-
-assert<BuildContext extends BuildContextLike ? true : false>();
-
-export function updateAccountThemeImplementationInConfig(params: {
-    buildContext: BuildContext;
-    accountThemeType: "Single-Page" | "Multi-Page";
-}) {
-    const { buildContext, accountThemeType } = params;
-
-    switch (buildContext.bundler) {
-        case "vite":
-            {
-                const viteConfigPath = pathJoin(
-                    buildContext.projectDirPath,
-                    "vite.config.ts"
-                );
-
-                if (!fs.existsSync(viteConfigPath)) {
-                    console.log(
-                        chalk.bold(
-                            `You must manually set the accountThemeImplementation to "${accountThemeType}" in your vite config`
-                        )
-                    );
-                    break;
-                }
-
-                const viteConfigContent = fs
-                    .readFileSync(viteConfigPath)
-                    .toString("utf8");
-
-                const modifiedViteConfigContent = viteConfigContent.replace(
-                    /accountThemeImplementation\s*:\s*"none"/,
-                    `accountThemeImplementation: "${accountThemeType}"`
-                );
-
-                if (modifiedViteConfigContent === viteConfigContent) {
-                    console.log(
-                        chalk.bold(
-                            `You must manually set the accountThemeImplementation to "${accountThemeType}" in your vite.config.ts`
-                        )
-                    );
-                    break;
-                }
-
-                fs.writeFileSync(viteConfigPath, modifiedViteConfigContent);
-            }
-            break;
-        case "webpack":
-            {
-                const parsedPackageJson = (() => {
-                    type ParsedPackageJson = {
-                        keycloakify: Record<string, string>;
-                    };
-
-                    const zParsedPackageJson = (() => {
-                        type TargetType = ParsedPackageJson;
-
-                        const zTargetType = z.object({
-                            keycloakify: z.record(z.string())
-                        });
-
-                        assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-                        return id<z.ZodType<TargetType>>(zTargetType);
-                    })();
-
-                    return zParsedPackageJson.parse(
-                        JSON.parse(
-                            fs
-                                .readFileSync(buildContext.packageJsonFilePath)
-                                .toString("utf8")
-                        )
-                    );
-                })();
-
-                parsedPackageJson.keycloakify.accountThemeImplementation =
-                    accountThemeType;
-            }
-            break;
-    }
-}
--- a/src/bin/initialize-email-theme.ts
+++ b/src/bin/initialize-email-theme.ts
@ -30,7 +30,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
        // NOTE: This is arbitrary
        startingFromMajor: 17,
        excludeMajorVersions: [],
-        buildContext
+        cacheDirPath: buildContext.cacheDirPath
    });

    const { defaultThemeDirPath } = await downloadKeycloakDefaultTheme({
--- a/src/bin/keycloakify/buildJars/buildJar.ts
+++ b/src/bin/keycloakify/buildJars/buildJar.ts
@ -7,7 +7,7 @@ import { join as pathJoin, dirname as pathDirname } from "path";
 import { transformCodebase } from "../../tools/transformCodebase";
 import type { BuildContext } from "../../shared/buildContext";
 import * as fs from "fs/promises";
-import { ACCOUNT_V1_THEME_NAME } from "../../shared/constants";
+import { accountV1ThemeName } from "../../shared/constants";
 import {
    generatePom,
    BuildContextLike as BuildContextLike_generatePom
@ -24,7 +24,6 @@ export type BuildContextLike = BuildContextLike_generatePom & {
    artifactId: string;
    themeVersion: string;
    cacheDirPath: string;
-    implementedThemeTypes: BuildContext["implementedThemeTypes"];
 };

 assert<BuildContext extends BuildContextLike ? true : false>();
@ -34,7 +33,6 @@ export async function buildJar(params: {
    keycloakAccountV1Version: KeycloakAccountV1Version;
    keycloakThemeAdditionalInfoExtensionVersion: KeycloakThemeAdditionalInfoExtensionVersion;
    resourcesDirPath: string;
-    doesImplementAccountV1Theme: boolean;
    buildContext: BuildContextLike;
 }): Promise<void> {
    const {
@ -42,30 +40,28 @@ export async function buildJar(params: {
        keycloakAccountV1Version,
        keycloakThemeAdditionalInfoExtensionVersion,
        resourcesDirPath,
-        doesImplementAccountV1Theme,
        buildContext
    } = params;

-    const keycloakifyBuildCacheDirPath = pathJoin(
+    const keycloakifyBuildTmpDirPath = pathJoin(
        buildContext.cacheDirPath,
-        "maven",
        jarFileBasename.replace(".jar", "")
    );

+    rmSync(keycloakifyBuildTmpDirPath, { recursive: true, force: true });
+
    const tmpResourcesDirPath = pathJoin(
-        keycloakifyBuildCacheDirPath,
+        keycloakifyBuildTmpDirPath,
        "src",
        "main",
        "resources"
    );

-    rmSync(tmpResourcesDirPath, { recursive: true, force: true });
-
    transformCodebase({
        srcDirPath: resourcesDirPath,
        destDirPath: tmpResourcesDirPath,
        transformSourceCode:
-            !doesImplementAccountV1Theme || keycloakAccountV1Version !== null
+            keycloakAccountV1Version !== null
                ? undefined
                : (params: {
                      fileRelativePath: string;
@ -75,7 +71,7 @@ export async function buildJar(params: {

                      if (
                          isInside({
-                              dirPath: pathJoin("theme", ACCOUNT_V1_THEME_NAME),
+                              dirPath: pathJoin("theme", accountV1ThemeName),
                              filePath: fileRelativePath
                          })
                      ) {
@ -91,7 +87,7 @@ export async function buildJar(params: {
                                  sourceCode
                                      .toString("utf8")
                                      .replace(
-                                          `parent=${ACCOUNT_V1_THEME_NAME}`,
+                                          `parent=${accountV1ThemeName}`,
                                          "parent=keycloak"
                                      ),
                                  "utf8"
@ -109,24 +105,14 @@ export async function buildJar(params: {
                  }
    });

-    remove_account_v1_in_meta_inf: {
-        if (!doesImplementAccountV1Theme) {
-            // NOTE: We do not have account v1 anyway
-            break remove_account_v1_in_meta_inf;
-        }
-
-        if (keycloakAccountV1Version !== null) {
-            // NOTE: No, we need to keep account-v1 in meta-inf
-            break remove_account_v1_in_meta_inf;
-        }
-
+    if (keycloakAccountV1Version === null) {
        writeMetaInfKeycloakThemes({
            resourcesDirPath: tmpResourcesDirPath,
            getNewMetaInfKeycloakTheme: ({ metaInfKeycloakTheme }) => {
                assert(metaInfKeycloakTheme !== undefined);

                metaInfKeycloakTheme.themes = metaInfKeycloakTheme.themes.filter(
-                    ({ name }) => name !== ACCOUNT_V1_THEME_NAME
+                    ({ name }) => name !== accountV1ThemeName
                );

                return metaInfKeycloakTheme;
@ -135,10 +121,6 @@ export async function buildJar(params: {
    }

    route_legacy_pages: {
-        if (!buildContext.implementedThemeTypes.login.isImplemented) {
-            break route_legacy_pages;
-        }
-
        // NOTE: If there's no account theme there is no special target for keycloak 24 and up so we create
        // the pages anyway. If there is an account pages, since we know that account-v1 is only support keycloak
        // 24 in version 0.4 and up, we can safely break the route for legacy pages.
@ -153,7 +135,6 @@ export async function buildJar(params: {
            }
        })();

-        // TODO: Remove this optimization, it's a bit hacky.
        if (doBreak) {
            break route_legacy_pages;
        }
@ -161,7 +142,10 @@ export async function buildJar(params: {
        (["register.ftl", "login-update-profile.ftl"] as const).forEach(pageId =>
            buildContext.themeNames.map(themeName => {
                const ftlFilePath = pathJoin(
-                    tmpResourcesDirPath,
+                    keycloakifyBuildTmpDirPath,
+                    "src",
+                    "main",
+                    "resources",
                    "theme",
                    themeName,
                    "login",
@ -170,7 +154,7 @@ export async function buildJar(params: {

                const ftlFileContent = readFileSync(ftlFilePath).toString("utf8");

-                const ftlFileBasename = (() => {
+                const realPageId = (() => {
                    switch (pageId) {
                        case "register.ftl":
                            return "register-user-profile.ftl";
@ -181,14 +165,14 @@ export async function buildJar(params: {
                })();

                const modifiedFtlFileContent = ftlFileContent.replace(
-                    `"ftlTemplateFileName": "${pageId}"`,
-                    `"ftlTemplateFileName": "${ftlFileBasename}"`
+                    `kcContext.pageId = "\${pageId}";`,
+                    `kcContext.pageId = "${pageId}"; kcContext.realPageId = "${realPageId}";`
                );

                assert(modifiedFtlFileContent !== ftlFileContent);

                fs.writeFile(
-                    pathJoin(pathDirname(ftlFilePath), ftlFileBasename),
+                    pathJoin(pathDirname(ftlFilePath), realPageId),
                    Buffer.from(modifiedFtlFileContent, "utf8")
                );
            })
@ -203,15 +187,15 @@ export async function buildJar(params: {
        });

        await fs.writeFile(
-            pathJoin(keycloakifyBuildCacheDirPath, "pom.xml"),
+            pathJoin(keycloakifyBuildTmpDirPath, "pom.xml"),
            Buffer.from(pomFileCode, "utf8")
        );
    }

    await new Promise<void>((resolve, reject) =>
        child_process.exec(
-            `mvn install -Dmaven.repo.local="${pathJoin(keycloakifyBuildCacheDirPath, ".m2")}"`,
-            { cwd: keycloakifyBuildCacheDirPath },
+            `mvn clean install -Dmaven.repo.local=${pathJoin(keycloakifyBuildTmpDirPath, ".m2")}`,
+            { cwd: keycloakifyBuildTmpDirPath },
            error => {
                if (error !== null) {
                    console.error(
@ -236,10 +220,12 @@ export async function buildJar(params: {

    await fs.rename(
        pathJoin(
-            keycloakifyBuildCacheDirPath,
+            keycloakifyBuildTmpDirPath,
            "target",
            `${buildContext.artifactId}-${buildContext.themeVersion}.jar`
        ),
        pathJoin(buildContext.keycloakifyBuildDirPath, jarFileBasename)
    );
+
+    rmSync(keycloakifyBuildTmpDirPath, { recursive: true });
 }
--- a/src/bin/keycloakify/buildJars/buildJars.ts
+++ b/src/bin/keycloakify/buildJars/buildJars.ts
@ -10,7 +10,7 @@ import type { BuildContext } from "../../shared/buildContext";
 export type BuildContextLike = BuildContextLike_buildJar & {
    projectDirPath: string;
    keycloakifyBuildDirPath: string;
-    implementedThemeTypes: BuildContext["implementedThemeTypes"];
+    recordIsImplementedByThemeType: BuildContext["recordIsImplementedByThemeType"];
    jarTargets: BuildContext["jarTargets"];
 };

@ -22,9 +22,7 @@ export async function buildJars(params: {
 }): Promise<void> {
    const { resourcesDirPath, buildContext } = params;

-    const doesImplementAccountV1Theme =
-        buildContext.implementedThemeTypes.account.isImplemented &&
-        buildContext.implementedThemeTypes.account.type === "Multi-Page";
+    const doesImplementAccountTheme = buildContext.recordIsImplementedByThemeType.account;

    await Promise.all(
        keycloakAccountV1Versions
@ -32,7 +30,7 @@ export async function buildJars(params: {
                keycloakThemeAdditionalInfoExtensionVersions.map(
                    keycloakThemeAdditionalInfoExtensionVersion => {
                        const keycloakVersionRange = getKeycloakVersionRangeForJar({
-                            doesImplementAccountV1Theme,
+                            doesImplementAccountTheme,
                            keycloakAccountV1Version,
                            keycloakThemeAdditionalInfoExtensionVersion
                        });
@ -57,7 +55,6 @@ export async function buildJars(params: {
                            keycloakAccountV1Version,
                            keycloakThemeAdditionalInfoExtensionVersion,
                            resourcesDirPath,
-                            doesImplementAccountV1Theme,
                            buildContext
                        });
                    }
--- a/src/bin/keycloakify/buildJars/getKeycloakVersionRangeForJar.ts
+++ b/src/bin/keycloakify/buildJars/getKeycloakVersionRangeForJar.ts
@ -6,17 +6,17 @@ import type {
 import type { KeycloakVersionRange } from "../../shared/KeycloakVersionRange";

 export function getKeycloakVersionRangeForJar(params: {
-    doesImplementAccountV1Theme: boolean;
+    doesImplementAccountTheme: boolean;
    keycloakAccountV1Version: KeycloakAccountV1Version;
    keycloakThemeAdditionalInfoExtensionVersion: KeycloakThemeAdditionalInfoExtensionVersion;
 }): KeycloakVersionRange | undefined {
    const {
        keycloakAccountV1Version,
        keycloakThemeAdditionalInfoExtensionVersion,
-        doesImplementAccountV1Theme
+        doesImplementAccountTheme
    } = params;

-    if (doesImplementAccountV1Theme) {
+    if (doesImplementAccountTheme) {
        const keycloakVersionRange = (() => {
            switch (keycloakAccountV1Version) {
                case null:
@ -63,7 +63,7 @@ export function getKeycloakVersionRangeForJar(params: {
        assert<
            Equals<
                typeof keycloakVersionRange,
-                KeycloakVersionRange.WithAccountV1Theme | undefined
+                KeycloakVersionRange.WithAccountTheme | undefined
            >
        >();

@ -87,7 +87,7 @@ export function getKeycloakVersionRangeForJar(params: {
        assert<
            Equals<
                typeof keycloakVersionRange,
-                KeycloakVersionRange.WithoutAccountV1Theme | undefined
+                KeycloakVersionRange.WithoutAccountTheme | undefined
            >
        >();

--- a/src/bin/keycloakify/generateFtl/generateFtl.ts
+++ b/src/bin/keycloakify/generateFtl/generateFtl.ts
@ -1,29 +1,25 @@
-import * as cheerio from "cheerio";
-import {
-    replaceImportsInJsCode,
-    BuildContextLike as BuildContextLike_replaceImportsInJsCode
-} from "../replacers/replaceImportsInJsCode";
-import {
-    replaceImportsInCssCode,
-    BuildContextLike as BuildContextLike_replaceImportsInCssCode
-} from "../replacers/replaceImportsInCssCode";
+import cheerio from "cheerio";
+import { replaceImportsInJsCode } from "../replacers/replaceImportsInJsCode";
+import { replaceImportsInCssCode } from "../replacers/replaceImportsInCssCode";
 import * as fs from "fs";
 import { join as pathJoin } from "path";
 import type { BuildContext } from "../../shared/buildContext";
 import { assert } from "tsafe/assert";
 import {
    type ThemeType,
-    BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR,
-    RESOURCES_COMMON
+    basenameOfTheKeycloakifyResourcesDir,
+    resources_common
 } from "../../shared/constants";
 import { getThisCodebaseRootDirPath } from "../../tools/getThisCodebaseRootDirPath";

-export type BuildContextLike = BuildContextLike_replaceImportsInJsCode &
-    BuildContextLike_replaceImportsInCssCode & {
-        urlPathname: string | undefined;
-        themeVersion: string;
-        kcContextExclusionsFtlCode: string | undefined;
-    };
+export type BuildContextLike = {
+    bundler: "vite" | "webpack";
+    themeVersion: string;
+    urlPathname: string | undefined;
+    projectBuildDirPath: string;
+    assetsDirPath: string;
+    kcContextExclusionsFtlCode: string | undefined;
+};

 assert<BuildContext extends BuildContextLike ? true : false>();

@ -77,8 +73,7 @@ export function generateFtlFilesCodeFactory(params: {
        (
            [
                ["link", "href"],
-                ["script", "src"],
-                ["script", "data-src"]
+                ["script", "src"]
            ] as const
        ).forEach(([selector, attrName]) =>
            $(selector).each((...[, element]) => {
@ -94,7 +89,7 @@ export function generateFtlFilesCodeFactory(params: {
                        new RegExp(
                            `^${(buildContext.urlPathname ?? "/").replace(/\//g, "\\/")}`
                        ),
-                        `\${xKeycloakify.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/`
+                        `\${url.resourcesPath}/${basenameOfTheKeycloakifyResourcesDir}/`
                    )
                );
            })
@ -114,17 +109,19 @@ export function generateFtlFilesCodeFactory(params: {
            )
        )
        .toString("utf8")
-        .replace("{{themeType}}", themeType)
-        .replace("{{themeName}}", themeName)
-        .replace("{{keycloakifyVersion}}", keycloakifyVersion)
-        .replace("{{themeVersion}}", buildContext.themeVersion)
-        .replace("{{fieldNames}}", fieldNames.map(name => `"${name}"`).join(", "))
-        .replace("{{RESOURCES_COMMON}}", RESOURCES_COMMON)
        .replace(
-            "{{userDefinedExclusions}}",
+            "FIELD_NAMES_eKsIY4ZsZ4xeM",
+            fieldNames.map(name => `"${name}"`).join(", ")
+        )
+        .replace("KEYCLOAKIFY_VERSION_xEdKd3xEdr", keycloakifyVersion)
+        .replace("KEYCLOAKIFY_THEME_VERSION_sIgKd3xEdr3dx", buildContext.themeVersion)
+        .replace("KEYCLOAKIFY_THEME_TYPE_dExKd3xEdr", themeType)
+        .replace("KEYCLOAKIFY_THEME_NAME_cXxKd3xEer", themeName)
+        .replace("RESOURCES_COMMON_cLsLsMrtDkpVv", resources_common)
+        .replace(
+            "USER_DEFINED_EXCLUSIONS_eKsaY4ZsZ4eMr2",
            buildContext.kcContextExclusionsFtlCode ?? ""
        );
-
    const ftlObjectToJsCodeDeclaringAnObjectPlaceholder =
        '{ "x": "vIdLqMeOed9sdLdIdOxdK0d" }';

@ -169,8 +166,7 @@ export function generateFtlFilesCodeFactory(params: {
        Object.entries({
            [ftlObjectToJsCodeDeclaringAnObjectPlaceholder]:
                kcContextDeclarationTemplateFtl,
-            "{{pageId}}": pageId,
-            "{{ftlTemplateFileName}}": pageId
+            PAGE_ID_xIgLsPgGId9D8e: pageId
        }).map(
            ([searchValue, replaceValue]) =>
                (ftlCode = ftlCode.replace(searchValue, replaceValue))
--- a/src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl
+++ b/src/bin/keycloakify/generateFtl/kcContextDeclarationTemplate.ftl
--- a/src/bin/keycloakify/generateResources/bringInAccountV1.ts
+++ b/src/bin/keycloakify/generateResources/bringInAccountV1.ts
@ -3,9 +3,9 @@ import { join as pathJoin } from "path";
 import { assert } from "tsafe/assert";
 import type { BuildContext } from "../../shared/buildContext";
 import {
-    RESOURCES_COMMON,
-    LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1,
-    ACCOUNT_V1_THEME_NAME
+    resources_common,
+    lastKeycloakVersionWithAccountV1,
+    accountV1ThemeName
 } from "../../shared/constants";
 import {
    downloadKeycloakDefaultTheme,
@ -24,14 +24,14 @@ export async function bringInAccountV1(params: {
    const { resourcesDirPath, buildContext } = params;

    const { defaultThemeDirPath } = await downloadKeycloakDefaultTheme({
-        keycloakVersion: LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1,
+        keycloakVersion: lastKeycloakVersionWithAccountV1,
        buildContext
    });

    const accountV1DirPath = pathJoin(
        resourcesDirPath,
        "theme",
-        ACCOUNT_V1_THEME_NAME,
+        accountV1ThemeName,
        "account"
    );

@ -47,7 +47,7 @@ export async function bringInAccountV1(params: {

    transformCodebase({
        srcDirPath: pathJoin(defaultThemeDirPath, "keycloak", "common", "resources"),
-        destDirPath: pathJoin(accountV1DirPath, "resources", RESOURCES_COMMON)
+        destDirPath: pathJoin(accountV1DirPath, "resources", resources_common)
    });

    fs.writeFileSync(
@ -69,7 +69,7 @@ export async function bringInAccountV1(params: {
                            "patternfly-additions.min.css"
                        ].map(
                            fileBasename =>
-                                `${RESOURCES_COMMON}/node_modules/patternfly/dist/css/${fileBasename}`
+                                `${resources_common}/node_modules/patternfly/dist/css/${fileBasename}`
                        )
                    ].join(" "),
                "",
--- a/src/bin/keycloakify/generateResources/generateMessageProperties.ts
+++ b/src/bin/keycloakify/generateResources/generateMessageProperties.ts
@ -1,4 +1,4 @@
-import { type ThemeType, FALLBACK_LANGUAGE_TAG } from "../../shared/constants";
+import { type ThemeType, fallbackLanguageTag } from "../../shared/constants";
 import { crawl } from "../../tools/crawl";
 import { join as pathJoin } from "path";
 import { symToStr } from "tsafe/symToStr";
@ -22,7 +22,7 @@ export function generateMessageProperties(params: {
        "src",
        themeType,
        "i18n",
-        "messages_defaultSet"
+        "baseMessages"
    );

    const baseMessageBundle: { [languageTag: string]: Record<string, string> } =
@ -168,7 +168,7 @@ export function generateMessageProperties(params: {
                    ...(messageBundle === undefined
                        ? {}
                        : messageBundle[languageTag] ??
-                          messageBundle[FALLBACK_LANGUAGE_TAG] ??
+                          messageBundle[fallbackLanguageTag] ??
                          messageBundle[Object.keys(messageBundle)[0]] ??
                          {})
                }
--- a/src/bin/keycloakify/generateResources/generateResourcesForMainTheme.ts
+++ b/src/bin/keycloakify/generateResources/generateResourcesForMainTheme.ts
@ -4,8 +4,7 @@ import {
    join as pathJoin,
    resolve as pathResolve,
    relative as pathRelative,
-    dirname as pathDirname,
-    basename as pathBasename
+    dirname as pathDirname
 } from "path";
 import { replaceImportsInJsCode } from "../replacers/replaceImportsInJsCode";
 import { replaceImportsInCssCode } from "../replacers/replaceImportsInCssCode";
@ -15,12 +14,12 @@ import {
 } from "../generateFtl";
 import {
    type ThemeType,
-    LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1,
-    KEYCLOAK_RESOURCES,
-    ACCOUNT_V1_THEME_NAME,
-    BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR,
-    LOGIN_THEME_PAGE_IDS,
-    ACCOUNT_THEME_PAGE_IDS
+    lastKeycloakVersionWithAccountV1,
+    keycloak_resources,
+    accountV1ThemeName,
+    basenameOfTheKeycloakifyResourcesDir,
+    loginThemePageIds,
+    accountThemePageIds
 } from "../../shared/constants";
 import type { BuildContext } from "../../shared/buildContext";
 import { assert, type Equals } from "tsafe/assert";
@ -43,7 +42,6 @@ import {
 } from "../../shared/metaInfKeycloakThemes";
 import { objectEntries } from "tsafe/objectEntries";
 import { escapeStringForPropertiesFile } from "../../tools/escapeStringForPropertiesFile";
-import { downloadAndExtractArchive } from "../../tools/downloadAndExtractArchive";

 export type BuildContextLike = BuildContextLike_kcContextExclusionsFtlCode &
    BuildContextLike_downloadKeycloakStaticResources &
@ -53,9 +51,8 @@ export type BuildContextLike = BuildContextLike_kcContextExclusionsFtlCode &
        projectDirPath: string;
        projectBuildDirPath: string;
        environmentVariables: { name: string; default: string }[];
-        implementedThemeTypes: BuildContext["implementedThemeTypes"];
+        recordIsImplementedByThemeType: BuildContext["recordIsImplementedByThemeType"];
        themeSrcDirPath: string;
-        bundler: "vite" | "webpack";
    };

 assert<BuildContext extends BuildContextLike ? true : false>();
@ -73,22 +70,17 @@ export async function generateResourcesForMainTheme(params: {
    };

    for (const themeType of ["login", "account"] as const) {
-        if (!buildContext.implementedThemeTypes[themeType].isImplemented) {
+        if (!buildContext.recordIsImplementedByThemeType[themeType]) {
            continue;
        }

-        const isForAccountSpa =
-            themeType === "account" &&
-            (assert(buildContext.implementedThemeTypes.account.isImplemented),
-            buildContext.implementedThemeTypes.account.type === "Single-Page");
-
        const themeTypeDirPath = getThemeTypeDirPath({ themeType });

        apply_replacers_and_move_to_theme_resources: {
            const destDirPath = pathJoin(
                themeTypeDirPath,
                "resources",
-                BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR
+                basenameOfTheKeycloakifyResourcesDir
            );

            // NOTE: Prevent accumulation of files in the assets dir, as names are hashed they pile up.
@ -96,7 +88,7 @@ export async function generateResourcesForMainTheme(params: {

            if (
                themeType === "account" &&
-                buildContext.implementedThemeTypes.login.isImplemented
+                buildContext.recordIsImplementedByThemeType.login
            ) {
                // NOTE: We prevent doing it twice, it has been done for the login theme.

@ -106,7 +98,7 @@ export async function generateResourcesForMainTheme(params: {
                            themeType: "login"
                        }),
                        "resources",
-                        BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR
+                        basenameOfTheKeycloakifyResourcesDir
                    ),
                    destDirPath
                });
@ -117,7 +109,7 @@ export async function generateResourcesForMainTheme(params: {
            {
                const dirPath = pathJoin(
                    buildContext.projectBuildDirPath,
-                    KEYCLOAK_RESOURCES
+                    keycloak_resources
                );

                if (fs.existsSync(dirPath)) {
@ -125,7 +117,7 @@ export async function generateResourcesForMainTheme(params: {

                    throw new Error(
                        [
-                            `Keycloakify build error: The ${KEYCLOAK_RESOURCES} directory shouldn't exist in your build directory.`,
+                            `Keycloakify build error: The ${keycloak_resources} directory shouldn't exist in your build directory.`,
                            `(${pathRelative(process.cwd(), dirPath)}).\n`,
                            `Theses assets are only required for local development with Storybook.",
                            "Please remove this directory as an additional step of your command.\n`,
@ -185,17 +177,15 @@ export async function generateResourcesForMainTheme(params: {
            ...(() => {
                switch (themeType) {
                    case "login":
-                        return LOGIN_THEME_PAGE_IDS;
+                        return loginThemePageIds;
                    case "account":
-                        return isForAccountSpa ? ["index.ftl"] : ACCOUNT_THEME_PAGE_IDS;
+                        return accountThemePageIds;
                }
            })(),
-            ...(isForAccountSpa
-                ? []
-                : readExtraPagesNames({
-                      themeType,
-                      themeSrcDirPath: buildContext.themeSrcDirPath
-                  }))
+            ...readExtraPagesNames({
+                themeType,
+                themeSrcDirPath: buildContext.themeSrcDirPath
+            })
        ].forEach(pageId => {
            const { ftlCode } = generateFtlFilesCode({ pageId });

@ -205,52 +195,40 @@ export async function generateResourcesForMainTheme(params: {
            );
        });

-        i18n_messages_generation: {
-            if (isForAccountSpa) {
-                break i18n_messages_generation;
-            }
+        generateMessageProperties({
+            themeSrcDirPath: buildContext.themeSrcDirPath,
+            themeType
+        }).forEach(({ languageTag, propertiesFileSource }) => {
+            const messagesDirPath = pathJoin(themeTypeDirPath, "messages");

-            generateMessageProperties({
-                themeSrcDirPath: buildContext.themeSrcDirPath,
-                themeType
-            }).forEach(({ languageTag, propertiesFileSource }) => {
-                const messagesDirPath = pathJoin(themeTypeDirPath, "messages");
-
-                fs.mkdirSync(pathJoin(themeTypeDirPath, "messages"), {
-                    recursive: true
-                });
-
-                const propertiesFilePath = pathJoin(
-                    messagesDirPath,
-                    `messages_${languageTag}.properties`
-                );
-
-                fs.writeFileSync(
-                    propertiesFilePath,
-                    Buffer.from(propertiesFileSource, "utf8")
-                );
+            fs.mkdirSync(pathJoin(themeTypeDirPath, "messages"), {
+                recursive: true
            });
-        }

-        keycloak_static_resources: {
-            if (isForAccountSpa) {
-                break keycloak_static_resources;
-            }
+            const propertiesFilePath = pathJoin(
+                messagesDirPath,
+                `messages_${languageTag}.properties`
+            );

-            await downloadKeycloakStaticResources({
-                keycloakVersion: (() => {
-                    switch (themeType) {
-                        case "account":
-                            return LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1;
-                        case "login":
-                            return buildContext.loginThemeResourcesFromKeycloakVersion;
-                    }
-                })(),
-                themeDirPath: pathResolve(pathJoin(themeTypeDirPath, "..")),
-                themeType,
-                buildContext
-            });
-        }
+            fs.writeFileSync(
+                propertiesFilePath,
+                Buffer.from(propertiesFileSource, "utf8")
+            );
+        });
+
+        await downloadKeycloakStaticResources({
+            keycloakVersion: (() => {
+                switch (themeType) {
+                    case "account":
+                        return lastKeycloakVersionWithAccountV1;
+                    case "login":
+                        return buildContext.loginThemeResourcesFromKeycloakVersion;
+                }
+            })(),
+            themeDirPath: pathResolve(pathJoin(themeTypeDirPath, "..")),
+            themeType,
+            buildContext
+        });

        fs.writeFileSync(
            pathJoin(themeTypeDirPath, "theme.properties"),
@ -259,13 +237,12 @@ export async function generateResourcesForMainTheme(params: {
                    `parent=${(() => {
                        switch (themeType) {
                            case "account":
-                                return isForAccountSpa ? "base" : ACCOUNT_V1_THEME_NAME;
+                                return accountV1ThemeName;
                            case "login":
                                return "keycloak";
                        }
                        assert<Equals<typeof themeType, never>>(false);
                    })()}`,
-                    ...(isForAccountSpa ? ["deprecatedMode=false"] : []),
                    ...(buildContext.extraThemeProperties ?? []),
                    ...buildContext.environmentVariables.map(
                        ({ name, default: defaultValue }) =>
@ -278,7 +255,7 @@ export async function generateResourcesForMainTheme(params: {
    }

    email: {
-        if (!buildContext.implementedThemeTypes.email.isImplemented) {
+        if (!buildContext.recordIsImplementedByThemeType.email) {
            break email;
        }

@ -290,70 +267,26 @@ export async function generateResourcesForMainTheme(params: {
        });
    }

-    bring_in_account_v1: {
-        if (!buildContext.implementedThemeTypes.account.isImplemented) {
-            break bring_in_account_v1;
-        }
-
-        if (buildContext.implementedThemeTypes.account.type !== "Multi-Page") {
-            break bring_in_account_v1;
-        }
-
+    if (buildContext.recordIsImplementedByThemeType.account) {
        await bringInAccountV1({
            resourcesDirPath,
            buildContext
        });
    }

-    bring_in_account_v3_i18n_messages: {
-        if (!buildContext.implementedThemeTypes.account.isImplemented) {
-            break bring_in_account_v3_i18n_messages;
-        }
-        if (buildContext.implementedThemeTypes.account.type !== "Single-Page") {
-            break bring_in_account_v3_i18n_messages;
-        }
-
-        const { extractedDirPath } = await downloadAndExtractArchive({
-            url: "https://repo1.maven.org/maven2/org/keycloak/keycloak-account-ui/25.0.1/keycloak-account-ui-25.0.1.jar",
-            cacheDirPath: buildContext.cacheDirPath,
-            fetchOptions: buildContext.fetchOptions,
-            uniqueIdOfOnArchiveFile: "bring_in_account_v3_i18n_messages",
-            onArchiveFile: async ({ fileRelativePath, writeFile }) => {
-                if (
-                    !fileRelativePath.startsWith(
-                        pathJoin("theme", "keycloak.v3", "account", "messages")
-                    )
-                ) {
-                    return;
-                }
-                await writeFile({
-                    fileRelativePath: pathBasename(fileRelativePath)
-                });
-            }
-        });
-
-        transformCodebase({
-            srcDirPath: extractedDirPath,
-            destDirPath: pathJoin(
-                getThemeTypeDirPath({ themeType: "account" }),
-                "messages"
-            )
-        });
-    }
-
    {
        const metaInfKeycloakThemes: MetaInfKeycloakTheme = { themes: [] };

        metaInfKeycloakThemes.themes.push({
            name: themeName,
-            types: objectEntries(buildContext.implementedThemeTypes)
-                .filter(([, { isImplemented }]) => isImplemented)
+            types: objectEntries(buildContext.recordIsImplementedByThemeType)
+                .filter(([, isImplemented]) => isImplemented)
                .map(([themeType]) => themeType)
        });

-        if (buildContext.implementedThemeTypes.account.isImplemented) {
+        if (buildContext.recordIsImplementedByThemeType.account) {
            metaInfKeycloakThemes.themes.push({
-                name: ACCOUNT_V1_THEME_NAME,
+                name: accountV1ThemeName,
                types: ["account"]
            });
        }
--- a/src/bin/keycloakify/generateResources/generateResourcesForThemeVariant.ts
+++ b/src/bin/keycloakify/generateResources/generateResourcesForThemeVariant.ts
@ -31,8 +31,8 @@ export function generateResourcesForThemeVariant(params: {
                    Buffer.from(sourceCode)
                        .toString("utf-8")
                        .replace(
-                            `"themeName": "${themeName}"`,
-                            `"themeName": "${themeVariantName}"`
+                            `kcContext.themeName = "${themeName}";`,
+                            `kcContext.themeName = "${themeVariantName}";`
                        ),
                    "utf8"
                );
--- a/src/bin/keycloakify/generateResources/readExtraPageNames.ts
+++ b/src/bin/keycloakify/generateResources/readExtraPageNames.ts
@ -5,8 +5,8 @@ import * as fs from "fs";
 import { join as pathJoin } from "path";
 import {
    type ThemeType,
-    ACCOUNT_THEME_PAGE_IDS,
-    LOGIN_THEME_PAGE_IDS
+    accountThemePageIds,
+    loginThemePageIds
 } from "../../shared/constants";

 export function readExtraPagesNames(params: {
@ -34,16 +34,19 @@ export function readExtraPagesNames(params: {
        const rawSourceFile = fs.readFileSync(candidateFilPath).toString("utf8");

        extraPages.push(
-            ...Array.from(rawSourceFile.matchAll(/["']([^.\s]+.ftl)["']:/g), m => m[1])
+            ...Array.from(
+                rawSourceFile.matchAll(/["']?pageId["']?\s*:\s*["']([^.]+.ftl)["']/g),
+                m => m[1]
+            )
        );
    }

    return extraPages.reduce(...removeDuplicates<string>()).filter(pageId => {
        switch (themeType) {
            case "account":
-                return !id<readonly string[]>(ACCOUNT_THEME_PAGE_IDS).includes(pageId);
+                return !id<readonly string[]>(accountThemePageIds).includes(pageId);
            case "login":
-                return !id<readonly string[]>(LOGIN_THEME_PAGE_IDS).includes(pageId);
+                return !id<readonly string[]>(loginThemePageIds).includes(pageId);
        }
    });
 }
--- a/src/bin/keycloakify/keycloakify.ts
+++ b/src/bin/keycloakify/keycloakify.ts
@ -3,7 +3,7 @@ import { join as pathJoin, relative as pathRelative, sep as pathSep } from "path
 import * as child_process from "child_process";
 import * as fs from "fs";
 import { getBuildContext } from "../shared/buildContext";
-import { VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES } from "../shared/constants";
+import { vitePluginSubScriptEnvNames } from "../shared/constants";
 import { buildJars } from "./buildJars";
 import type { CliCommandOptions } from "../main";
 import chalk from "chalk";
@ -12,6 +12,12 @@ import * as os from "os";
 import { rmSync } from "../tools/fs.rmSync";

 export async function command(params: { cliCommandOptions: CliCommandOptions }) {
+    console.log("DEBUG:", {
+        __filename,
+        __dirname,
+        "process.cwd()": process.cwd()
+    });
+
    exit_if_maven_not_installed: {
        let commandOutput: Buffer | undefined = undefined;

@ -93,12 +99,10 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
            cwd: buildContext.projectDirPath,
            env: {
                ...process.env,
-                [VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES.RUN_POST_BUILD_SCRIPT]: JSON.stringify(
-                    {
-                        resourcesDirPath,
-                        buildContext
-                    }
-                )
+                [vitePluginSubScriptEnvNames.runPostBuildScript]: JSON.stringify({
+                    resourcesDirPath,
+                    buildContext
+                })
            }
        });
    }
--- a/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts
+++ b/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts
@ -1,5 +1,5 @@
 import type { BuildContext } from "../../shared/buildContext";
-import { BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR } from "../../shared/constants";
+import { basenameOfTheKeycloakifyResourcesDir } from "../../shared/constants";
 import { assert } from "tsafe/assert";
 import { posix } from "path";

@ -18,49 +18,35 @@ export function replaceImportsInCssCode(params: {
 } {
    const { cssCode, cssFileRelativeDirPath, buildContext } = params;

-    let fixedCssCode = cssCode;
-
-    [
-        /url\("(\/[^/][^"]+)"\)/g,
-        /url\('(\/[^/][^']+)'\)/g,
-        /url\((\/[^/][^)]+)\)/g
-    ].forEach(
-        regex =>
-            (fixedCssCode = fixedCssCode.replace(
-                regex,
-                (match, assetFileAbsoluteUrlPathname) => {
-                    if (buildContext.urlPathname !== undefined) {
-                        if (
-                            !assetFileAbsoluteUrlPathname.startsWith(
-                                buildContext.urlPathname
-                            )
-                        ) {
-                            // NOTE: Should never happen
-                            return match;
-                        }
-                        assetFileAbsoluteUrlPathname =
-                            assetFileAbsoluteUrlPathname.replace(
-                                buildContext.urlPathname,
-                                "/"
-                            );
-                    }
-
-                    inline_style_in_html: {
-                        if (cssFileRelativeDirPath !== undefined) {
-                            break inline_style_in_html;
-                        }
-
-                        return `url("\${xKeycloakify.resourcesPath}/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}${assetFileAbsoluteUrlPathname}")`;
-                    }
-
-                    const assetFileRelativeUrlPathname = posix.relative(
-                        cssFileRelativeDirPath.replace(/\\/g, "/"),
-                        assetFileAbsoluteUrlPathname.replace(/^\//, "")
-                    );
-
-                    return `url("${assetFileRelativeUrlPathname}")`;
+    const fixedCssCode = cssCode.replace(
+        /url\(["']?(\/[^/][^)"']+)["']?\)/g,
+        (match, assetFileAbsoluteUrlPathname) => {
+            if (buildContext.urlPathname !== undefined) {
+                if (!assetFileAbsoluteUrlPathname.startsWith(buildContext.urlPathname)) {
+                    // NOTE: Should never happen
+                    return match;
                }
-            ))
+                assetFileAbsoluteUrlPathname = assetFileAbsoluteUrlPathname.replace(
+                    buildContext.urlPathname,
+                    "/"
+                );
+            }
+
+            inline_style_in_html: {
+                if (cssFileRelativeDirPath !== undefined) {
+                    break inline_style_in_html;
+                }
+
+                return `url(\${url.resourcesPath}/${basenameOfTheKeycloakifyResourcesDir}${assetFileAbsoluteUrlPathname})`;
+            }
+
+            const assetFileRelativeUrlPathname = posix.relative(
+                cssFileRelativeDirPath.replace(/\\/g, "/"),
+                assetFileAbsoluteUrlPathname.replace(/^\//, "")
+            );
+
+            return `url(${assetFileRelativeUrlPathname})`;
+        }
    );

    return { fixedCssCode };
--- a/src/bin/keycloakify/replacers/replaceImportsInJsCode/vite.ts
+++ b/src/bin/keycloakify/replacers/replaceImportsInJsCode/vite.ts
@ -1,4 +1,4 @@
-import { BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR } from "../../../shared/constants";
+import { basenameOfTheKeycloakifyResourcesDir } from "../../../shared/constants";
 import { assert } from "tsafe/assert";
 import type { BuildContext } from "../../../shared/buildContext";
 import * as nodePath from "path";
@ -31,13 +31,13 @@ export function replaceImportsInJsCode_vite(params: {

    let fixedJsCode = jsCode;

-    replace_base_js_import: {
+    replace_base_javacript_import: {
        if (buildContext.urlPathname === undefined) {
-            break replace_base_js_import;
+            break replace_base_javacript_import;
        }
        // Optimization
        if (!jsCode.includes(buildContext.urlPathname)) {
-            break replace_base_js_import;
+            break replace_base_javacript_import;
        }

        // Replace `Hv=function(e){return"/abcde12345/"+e}` by `Hv=function(e){return"/"+e}`
@ -85,13 +85,13 @@ export function replaceImportsInJsCode_vite(params: {
                fixedJsCode = replaceAll(
                    fixedJsCode,
                    `"${relativePathOfAssetFile}"`,
-                    `(window.kcContext["x-keycloakify"].resourcesPath.substring(1) + "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/${relativePathOfAssetFile}")`
+                    `(window.kcContext.url.resourcesPath.substring(1) + "/${basenameOfTheKeycloakifyResourcesDir}/${relativePathOfAssetFile}")`
                );

                fixedJsCode = replaceAll(
                    fixedJsCode,
                    `"${buildContext.urlPathname ?? "/"}${relativePathOfAssetFile}"`,
-                    `(window.kcContext["x-keycloakify"].resourcesPath + "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/${relativePathOfAssetFile}")`
+                    `(window.kcContext.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/${relativePathOfAssetFile}")`
                );
            });
    }
--- a/src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts
+++ b/src/bin/keycloakify/replacers/replaceImportsInJsCode/webpack.ts
@ -1,4 +1,4 @@
-import { BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR } from "../../../shared/constants";
+import { basenameOfTheKeycloakifyResourcesDir } from "../../../shared/constants";
 import { assert } from "tsafe/assert";
 import type { BuildContext } from "../../../shared/buildContext";
 import * as nodePath from "path";
@ -83,14 +83,14 @@ export function replaceImportsInJsCode_webpack(params: {
                var pd = Object.getOwnPropertyDescriptor(${n}, "p");
                if( pd === undefined || pd.configurable ){
                    Object.defineProperty(${n}, "p", {
-                        get: function() { return window.kcContext["x-keycloakify"].resourcesPath; },
+                        get: function() { return window.kcContext.url.resourcesPath; },
                        set: function() {}
                    });
                }
                return "${u}";
            })()] = ${
                isArrowFunction ? `${e} =>` : `function(${e}) { return `
-            } "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/${staticDir}${language}/"`
+            } "/${basenameOfTheKeycloakifyResourcesDir}/${staticDir}${language}/"`
                .replace(/\s+/g, " ")
                .trim();
        }
@ -104,7 +104,7 @@ export function replaceImportsInJsCode_webpack(params: {
                `[a-zA-Z]+\\.[a-zA-Z]+\\+"${staticDir.replace(/\//g, "\\/")}`,
                "g"
            ),
-            `window.kcContext["x-keycloakify"].resourcesPath + "/${BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR}/${staticDir}`
+            `window.kcContext.url.resourcesPath + "/${basenameOfTheKeycloakifyResourcesDir}/${staticDir}`
        );

    return { fixedJsCode };
--- a/src/bin/main.ts
+++ b/src/bin/main.ts
@ -3,14 +3,11 @@
 import { termost } from "termost";
 import { readThisNpmPackageVersion } from "./tools/readThisNpmPackageVersion";
 import * as child_process from "child_process";
-import { assertNoPnpmDlx } from "./tools/assertNoPnpmDlx";

 export type CliCommandOptions = {
    projectDirPath: string | undefined;
 };

-assertNoPnpmDlx();
-
 const program = termost<CliCommandOptions>(
    {
        name: "keycloakify",
@ -78,7 +75,7 @@ program

 program
    .command<{
-        port: number | undefined;
+        port: number;
        keycloakVersion: string | undefined;
        realmJsonFilePath: string | undefined;
    }>({
@ -96,7 +93,7 @@ program
            return name;
        })(),
        description: ["Keycloak server port.", "Example `--port 8085`"].join(" "),
-        defaultValue: undefined
+        defaultValue: 8080
    })
    .option({
        key: "keycloakVersion",
@ -179,20 +176,6 @@ program
        }
    });

-program
-    .command({
-        name: "initialize-account-theme",
-        description: "Initialize the account theme."
-    })
-    .task({
-        skip,
-        handler: async cliCommandOptions => {
-            const { command } = await import("./initialize-account-theme");
-
-            await command({ cliCommandOptions });
-        }
-    });
-
 program
    .command({
        name: "copy-keycloak-resources-to-public",
--- a/src/bin/shared/KeycloakVersionRange.ts
+++ b/src/bin/shared/KeycloakVersionRange.ts
@ -1,9 +1,9 @@
 export type KeycloakVersionRange =
-    | KeycloakVersionRange.WithAccountV1Theme
-    | KeycloakVersionRange.WithoutAccountV1Theme;
+    | KeycloakVersionRange.WithAccountTheme
+    | KeycloakVersionRange.WithoutAccountTheme;

 export namespace KeycloakVersionRange {
-    export type WithoutAccountV1Theme = "21-and-below" | "22-and-above";
+    export type WithoutAccountTheme = "21-and-below" | "22-and-above";

-    export type WithAccountV1Theme = "21-and-below" | "23" | "24" | "25-and-above";
+    export type WithAccountTheme = "21-and-below" | "23" | "24" | "25-and-above";
 }
--- a/src/bin/shared/buildContext.ts
+++ b/src/bin/shared/buildContext.ts
--- a/src/bin/shared/constants.ts
+++ b/src/bin/shared/constants.ts
@ -1,22 +1,22 @@
-export const KEYCLOAK_RESOURCES = "keycloak-resources";
-export const RESOURCES_COMMON = "resources-common";
-export const LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1 = "21.1.2";
-export const BASENAME_OF_KEYCLOAKIFY_RESOURCES_DIR = "dist";
+export const keycloak_resources = "keycloak-resources";
+export const resources_common = "resources-common";
+export const lastKeycloakVersionWithAccountV1 = "21.1.2";
+export const basenameOfTheKeycloakifyResourcesDir = "dist";

-export const THEME_TYPES = ["login", "account"] as const;
-export const ACCOUNT_V1_THEME_NAME = "account-v1";
+export const themeTypes = ["login", "account"] as const;
+export const accountV1ThemeName = "account-v1";

-export type ThemeType = (typeof THEME_TYPES)[number];
+export type ThemeType = (typeof themeTypes)[number];

-export const VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES = {
-    RUN_POST_BUILD_SCRIPT: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
-    RESOLVE_VITE_CONFIG: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
+export const vitePluginSubScriptEnvNames = {
+    runPostBuildScript: "KEYCLOAKIFY_RUN_POST_BUILD_SCRIPT",
+    resolveViteConfig: "KEYCLOAKIFY_RESOLVE_VITE_CONFIG"
 } as const;

-export const BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME =
+export const buildForKeycloakMajorVersionEnvName =
    "KEYCLOAKIFY_BUILD_FOR_KEYCLOAK_MAJOR_VERSION";

-export const LOGIN_THEME_PAGE_IDS = [
+export const loginThemePageIds = [
    "login.ftl",
    "login-username.ftl",
    "login-password.ftl",
@ -53,7 +53,7 @@ export const LOGIN_THEME_PAGE_IDS = [
    "webauthn-error.ftl"
 ] as const;

-export const ACCOUNT_THEME_PAGE_IDS = [
+export const accountThemePageIds = [
    "password.ftl",
    "account.ftl",
    "sessions.ftl",
@ -63,11 +63,9 @@ export const ACCOUNT_THEME_PAGE_IDS = [
    "federatedIdentity.ftl"
 ] as const;

-export type LoginThemePageId = (typeof LOGIN_THEME_PAGE_IDS)[number];
-export type AccountThemePageId = (typeof ACCOUNT_THEME_PAGE_IDS)[number];
+export type LoginThemePageId = (typeof loginThemePageIds)[number];
+export type AccountThemePageId = (typeof accountThemePageIds)[number];

-export const CONTAINER_NAME = "keycloak-keycloakify";
+export const containerName = "keycloak-keycloakify";

-export const FALLBACK_LANGUAGE_TAG = "en";
-
-export const LOGIN_THEME_RESOURCES_FROMkEYCLOAK_VERSION_DEFAULT = "24.0.4";
+export const fallbackLanguageTag = "en";
--- a/src/bin/shared/copyKeycloakResourcesToPublic.ts
+++ b/src/bin/shared/copyKeycloakResourcesToPublic.ts
@ -4,9 +4,9 @@ import {
 } from "./downloadKeycloakStaticResources";
 import { join as pathJoin, relative as pathRelative } from "path";
 import {
-    THEME_TYPES,
-    KEYCLOAK_RESOURCES,
-    LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1
+    themeTypes,
+    keycloak_resources,
+    lastKeycloakVersionWithAccountV1
 } from "../shared/constants";
 import { readThisNpmPackageVersion } from "../tools/readThisNpmPackageVersion";
 import { assert } from "tsafe/assert";
@ -26,7 +26,7 @@ export async function copyKeycloakResourcesToPublic(params: {
 }) {
    const { buildContext } = params;

-    const destDirPath = pathJoin(buildContext.publicDirPath, KEYCLOAK_RESOURCES);
+    const destDirPath = pathJoin(buildContext.publicDirPath, keycloak_resources);

    const keycloakifyBuildinfoFilePath = pathJoin(destDirPath, "keycloakify.buildinfo");

@ -37,7 +37,10 @@ export async function copyKeycloakResourcesToPublic(params: {
            buildContext: {
                loginThemeResourcesFromKeycloakVersion: readThisNpmPackageVersion(),
                cacheDirPath: pathRelative(destDirPath, buildContext.cacheDirPath),
-                fetchOptions: buildContext.fetchOptions
+                npmWorkspaceRootDirPath: pathRelative(
+                    destDirPath,
+                    buildContext.npmWorkspaceRootDirPath
+                )
            }
        },
        null,
@ -66,14 +69,14 @@ export async function copyKeycloakResourcesToPublic(params: {

    fs.writeFileSync(pathJoin(destDirPath, ".gitignore"), Buffer.from("*", "utf8"));

-    for (const themeType of THEME_TYPES) {
+    for (const themeType of themeTypes) {
        await downloadKeycloakStaticResources({
            keycloakVersion: (() => {
                switch (themeType) {
                    case "login":
                        return buildContext.loginThemeResourcesFromKeycloakVersion;
                    case "account":
-                        return LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1;
+                        return lastKeycloakVersionWithAccountV1;
                }
            })(),
            themeType,
--- a/src/bin/shared/downloadKeycloakDefaultTheme.ts
+++ b/src/bin/shared/downloadKeycloakDefaultTheme.ts
@ -1,12 +1,12 @@
 import { join as pathJoin, relative as pathRelative } from "path";
 import { type BuildContext } from "./buildContext";
 import { assert } from "tsafe/assert";
-import { LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1 } from "./constants";
+import { lastKeycloakVersionWithAccountV1 } from "./constants";
 import { downloadAndExtractArchive } from "../tools/downloadAndExtractArchive";

 export type BuildContextLike = {
    cacheDirPath: string;
-    fetchOptions: BuildContext["fetchOptions"];
+    npmWorkspaceRootDirPath: string;
 };

 assert<BuildContext extends BuildContextLike ? true : false>();
@ -17,14 +17,14 @@ export async function downloadKeycloakDefaultTheme(params: {
 }): Promise<{ defaultThemeDirPath: string }> {
    const { keycloakVersion, buildContext } = params;

-    let kcNodeModulesKeepFilePaths: Set<string> | undefined = undefined;
-    let kcNodeModulesKeepFilePaths_lastAccountV1: Set<string> | undefined = undefined;
+    let kcNodeModulesKeepFilePaths: string[] | undefined = undefined;
+    let kcNodeModulesKeepFilePaths_lastAccountV1: string[] | undefined = undefined;

    const { extractedDirPath } = await downloadAndExtractArchive({
        url: `https://repo1.maven.org/maven2/org/keycloak/keycloak-themes/${keycloakVersion}/keycloak-themes-${keycloakVersion}.jar`,
        cacheDirPath: buildContext.cacheDirPath,
-        fetchOptions: buildContext.fetchOptions,
-        uniqueIdOfOnArchiveFile: "downloadKeycloakDefaultTheme",
+        npmWorkspaceRootDirPath: buildContext.npmWorkspaceRootDirPath,
+        uniqueIdOfOnOnArchiveFile: "downloadKeycloakDefaultTheme",
        onArchiveFile: async params => {
            const fileRelativePath = pathRelative("theme", params.fileRelativePath);

@ -43,7 +43,7 @@ export async function downloadKeycloakDefaultTheme(params: {
            }

            last_account_v1_transformations: {
-                if (LAST_KEYCLOAK_VERSION_WITH_ACCOUNT_V1 !== keycloakVersion) {
+                if (lastKeycloakVersionWithAccountV1 !== keycloakVersion) {
                    break last_account_v1_transformations;
                }

@ -72,19 +72,16 @@ export async function downloadKeycloakDefaultTheme(params: {
                }

                skip_node_modules: {
-                    const nodeModulesRelativeDirPath = pathJoin(
-                        "keycloak",
-                        "common",
-                        "resources",
-                        "node_modules"
-                    );
-
-                    if (!fileRelativePath.startsWith(nodeModulesRelativeDirPath)) {
+                    if (
+                        !fileRelativePath.startsWith(
+                            pathJoin("keycloak", "common", "resources", "node_modules")
+                        )
+                    ) {
                        break skip_node_modules;
                    }

                    if (kcNodeModulesKeepFilePaths_lastAccountV1 === undefined) {
-                        kcNodeModulesKeepFilePaths_lastAccountV1 = new Set([
+                        kcNodeModulesKeepFilePaths_lastAccountV1 = [
                            pathJoin("patternfly", "dist", "css", "patternfly.min.css"),
                            pathJoin(
                                "patternfly",
@ -128,19 +125,13 @@ export async function downloadKeycloakDefaultTheme(params: {
                                "fonts",
                                "PatternFlyIcons-webfont.woff"
                            )
-                        ]);
+                        ];
                    }

-                    const fileRelativeToNodeModulesPath = fileRelativePath.substring(
-                        nodeModulesRelativeDirPath.length + 1
-                    );
-
-                    if (
-                        kcNodeModulesKeepFilePaths_lastAccountV1.has(
-                            fileRelativeToNodeModulesPath
-                        )
-                    ) {
-                        break skip_node_modules;
+                    for (const keepPath of kcNodeModulesKeepFilePaths_lastAccountV1) {
+                        if (fileRelativePath.endsWith(keepPath)) {
+                            break skip_node_modules;
+                        }
                    }

                    return;
@ -174,19 +165,16 @@ export async function downloadKeycloakDefaultTheme(params: {
                }

                skip_node_modules: {
-                    const nodeModulesRelativeDirPath = pathJoin(
-                        "keycloak",
-                        "common",
-                        "resources",
-                        "node_modules"
-                    );
-
-                    if (!fileRelativePath.startsWith(nodeModulesRelativeDirPath)) {
+                    if (
+                        !fileRelativePath.startsWith(
+                            pathJoin("keycloak", "common", "resources", "node_modules")
+                        )
+                    ) {
                        break skip_node_modules;
                    }

                    if (kcNodeModulesKeepFilePaths === undefined) {
-                        kcNodeModulesKeepFilePaths = new Set([
+                        kcNodeModulesKeepFilePaths = [
                            pathJoin("@patternfly", "patternfly", "patternfly.min.css"),
                            pathJoin("patternfly", "dist", "css", "patternfly.min.css"),
                            pathJoin(
@ -243,23 +231,14 @@ export async function downloadKeycloakDefaultTheme(params: {
                                "fonts",
                                "PatternFlyIcons-webfont.woff"
                            ),
-                            pathJoin(
-                                "patternfly",
-                                "dist",
-                                "fonts",
-                                "OpenSans-Semibold-webfont.woff2"
-                            ),
-                            pathJoin("patternfly", "dist", "img", "bg-login.jpg"),
                            pathJoin("jquery", "dist", "jquery.min.js")
-                        ]);
+                        ];
                    }

-                    const fileRelativeToNodeModulesPath = fileRelativePath.substring(
-                        nodeModulesRelativeDirPath.length + 1
-                    );
-
-                    if (kcNodeModulesKeepFilePaths.has(fileRelativeToNodeModulesPath)) {
-                        break skip_node_modules;
+                    for (const keepPath of kcNodeModulesKeepFilePaths) {
+                        if (fileRelativePath.endsWith(keepPath)) {
+                            break skip_node_modules;
+                        }
                    }

                    return;
--- a/src/bin/shared/downloadKeycloakStaticResources.ts
+++ b/src/bin/shared/downloadKeycloakStaticResources.ts
@ -4,7 +4,7 @@ import {
    downloadKeycloakDefaultTheme,
    type BuildContextLike as BuildContextLike_downloadKeycloakDefaultTheme
 } from "./downloadKeycloakDefaultTheme";
-import { RESOURCES_COMMON, type ThemeType } from "./constants";
+import { resources_common, type ThemeType } from "./constants";
 import type { BuildContext } from "./buildContext";
 import { assert } from "tsafe/assert";
 import { existsAsync } from "../tools/fs.existsAsync";
@ -48,6 +48,6 @@ export async function downloadKeycloakStaticResources(params: {

    transformCodebase({
        srcDirPath: pathJoin(defaultThemeDirPath, "keycloak", "common", "resources"),
-        destDirPath: pathJoin(resourcesDirPath, RESOURCES_COMMON)
+        destDirPath: pathJoin(resourcesDirPath, resources_common)
    });
 }
--- a/src/bin/shared/generateKcGenTs.ts
+++ b/src/bin/shared/generateKcGenTs.ts
@ -1,21 +1,14 @@
-import { assert, type Equals } from "tsafe/assert";
-import { id } from "tsafe/id";
+import { assert } from "tsafe/assert";
 import type { BuildContext } from "./buildContext";
 import * as fs from "fs/promises";
 import { join as pathJoin } from "path";
 import { existsAsync } from "../tools/fs.existsAsync";
-import { z } from "zod";

 export type BuildContextLike = {
    projectDirPath: string;
    themeNames: string[];
    environmentVariables: { name: string; default: string }[];
    themeSrcDirPath: string;
-    implementedThemeTypes: Pick<
-        BuildContext["implementedThemeTypes"],
-        "login" | "account"
-    >;
-    packageJsonFilePath: string;
 };

 assert<BuildContext extends BuildContextLike ? true : false>();
@ -25,53 +18,12 @@ export async function generateKcGenTs(params: {
 }): Promise<void> {
    const { buildContext } = params;

-    const isReactProject: boolean = await (async () => {
-        const parsedPackageJson = await (async () => {
-            type ParsedPackageJson = {
-                dependencies?: Record<string, string>;
-                devDependencies?: Record<string, string>;
-            };
-
-            const zParsedPackageJson = (() => {
-                type TargetType = ParsedPackageJson;
-
-                const zTargetType = z.object({
-                    dependencies: z.record(z.string()).optional(),
-                    devDependencies: z.record(z.string()).optional()
-                });
-
-                assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-                return id<z.ZodType<TargetType>>(zTargetType);
-            })();
-
-            return zParsedPackageJson.parse(
-                JSON.parse(
-                    (await fs.readFile(buildContext.packageJsonFilePath)).toString("utf8")
-                )
-            );
-        })();
-
-        return (
-            {
-                ...parsedPackageJson.dependencies,
-                ...parsedPackageJson.devDependencies
-            }.react !== undefined
-        );
-    })();
-
-    const filePath = pathJoin(
-        buildContext.themeSrcDirPath,
-        `kc.gen.ts${isReactProject ? "x" : ""}`
-    );
+    const filePath = pathJoin(buildContext.themeSrcDirPath, "kc.gen.ts");

    const currentContent = (await existsAsync(filePath))
        ? await fs.readFile(filePath)
        : undefined;

-    const hasLoginTheme = buildContext.implementedThemeTypes.login.isImplemented;
-    const hasAccountTheme = buildContext.implementedThemeTypes.account.isImplemented;
-
    const newContent = Buffer.from(
        [
            `/* prettier-ignore-start */`,
@ -84,8 +36,6 @@ export async function generateKcGenTs(params: {
            ``,
            `// This file is auto-generated by Keycloakify`,
            ``,
-            isReactProject && `import { lazy, Suspense, type ReactNode } from "react";`,
-            ``,
            `export type ThemeName = ${buildContext.themeNames.map(themeName => `"${themeName}"`).join(" | ")};`,
            ``,
            `export const themeNames: ThemeName[] = [${buildContext.themeNames.map(themeName => `"${themeName}"`).join(", ")}];`,
@ -104,52 +54,9 @@ export async function generateKcGenTs(params: {
                2
            )};`,
            ``,
-            `export type KcContext =`,
-            hasLoginTheme && `    | import("./login/KcContext").KcContext`,
-            hasAccountTheme && `    | import("./account/KcContext").KcContext`,
-            `    ;`,
-            ``,
-            `declare global {`,
-            `    interface Window {`,
-            `        kcContext?: KcContext;`,
-            `    }`,
-            `}`,
-            ``,
-            ...(!isReactProject
-                ? []
-                : [
-                      hasLoginTheme &&
-                          `export const KcLoginPage = lazy(() => import("./login/KcPage"));`,
-                      hasAccountTheme &&
-                          `export const KcAccountPage = lazy(() => import("./account/KcPage"));`,
-                      ``,
-                      `export function KcPage(`,
-                      `    props: {`,
-                      `        kcContext: KcContext;`,
-                      `        fallback?: ReactNode;`,
-                      `    }`,
-                      `) {`,
-                      `    const { kcContext, fallback } = props;`,
-                      `    return (`,
-                      `        <Suspense fallback={fallback}>`,
-                      `            {(() => {`,
-                      `                switch (kcContext.themeType) {`,
-                      hasLoginTheme &&
-                          `                    case "login": return <KcLoginPage kcContext={kcContext} />;`,
-                      hasAccountTheme &&
-                          `                    case "account": return <KcAccountPage kcContext={kcContext} />;`,
-                      `                }`,
-                      `            })()}`,
-                      `        </Suspense>`,
-                      `    );`,
-                      `}`
-                  ]),
-            ``,
            `/* prettier-ignore-end */`,
            ``
-        ]
-            .filter(item => typeof item === "string")
-            .join("\n"),
+        ].join("\n"),
        "utf8"
    );

@ -158,18 +65,4 @@ export async function generateKcGenTs(params: {
    }

    await fs.writeFile(filePath, newContent);
-
-    delete_legacy_file: {
-        if (!isReactProject) {
-            break delete_legacy_file;
-        }
-
-        const legacyFilePath = filePath.replace(/tsx$/, "ts");
-
-        if (!(await existsAsync(legacyFilePath))) {
-            break delete_legacy_file;
-        }
-
-        await fs.unlink(legacyFilePath);
-    }
 }
--- a/src/bin/shared/getLatestsSemVersionedTag.ts
+++ b/src/bin/shared/getLatestsSemVersionedTag.ts
@ -1,201 +0,0 @@
-import { getLatestsSemVersionedTagFactory } from "../tools/octokit-addons/getLatestsSemVersionedTag";
-import { Octokit } from "@octokit/rest";
-import type { ReturnType } from "tsafe";
-import type { Param0 } from "tsafe";
-import { join as pathJoin, dirname as pathDirname } from "path";
-import * as fs from "fs";
-import { z } from "zod";
-import { assert, type Equals } from "tsafe/assert";
-import { id } from "tsafe/id";
-import type { SemVer } from "../tools/SemVer";
-import { same } from "evt/tools/inDepth/same";
-import type { BuildContext } from "./buildContext";
-import fetch from "make-fetch-happen";
-
-type GetLatestsSemVersionedTag = ReturnType<
-    typeof getLatestsSemVersionedTagFactory
->["getLatestsSemVersionedTag"];
-
-type Params = Param0<GetLatestsSemVersionedTag>;
-type R = ReturnType<GetLatestsSemVersionedTag>;
-
-let getLatestsSemVersionedTag_stateless: GetLatestsSemVersionedTag | undefined =
-    undefined;
-
-const CACHE_VERSION = 1;
-
-type Cache = {
-    version: typeof CACHE_VERSION;
-    entries: {
-        time: number;
-        params: Params;
-        result: R;
-    }[];
-};
-
-export type BuildContextLike = {
-    cacheDirPath: string;
-    fetchOptions: BuildContext["fetchOptions"];
-};
-
-assert<BuildContext extends BuildContextLike ? true : false>();
-
-export async function getLatestsSemVersionedTag({
-    buildContext,
-    ...params
-}: Params & {
-    buildContext: BuildContextLike;
-}): Promise<R> {
-    const cacheFilePath = pathJoin(
-        buildContext.cacheDirPath,
-        "latest-sem-versioned-tags.json"
-    );
-
-    const cacheLookupResult = (() => {
-        const getResult_currentCache = (currentCacheEntries: Cache["entries"]) => ({
-            hasCachedResult: false as const,
-            currentCache: {
-                version: CACHE_VERSION,
-                entries: currentCacheEntries
-            }
-        });
-
-        if (!fs.existsSync(cacheFilePath)) {
-            return getResult_currentCache([]);
-        }
-
-        let cache_json;
-
-        try {
-            cache_json = fs.readFileSync(cacheFilePath).toString("utf8");
-        } catch {
-            return getResult_currentCache([]);
-        }
-
-        let cache_json_parsed: unknown;
-
-        try {
-            cache_json_parsed = JSON.parse(cache_json);
-        } catch {
-            return getResult_currentCache([]);
-        }
-
-        const zSemVer = (() => {
-            type TargetType = SemVer;
-
-            const zTargetType = z.object({
-                major: z.number(),
-                minor: z.number(),
-                patch: z.number(),
-                rc: z.number().optional(),
-                parsedFrom: z.string()
-            });
-
-            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-            return id<z.ZodType<TargetType>>(zTargetType);
-        })();
-
-        const zCache = (() => {
-            type TargetType = Cache;
-
-            const zTargetType = z.object({
-                version: z.literal(CACHE_VERSION),
-                entries: z.array(
-                    z.object({
-                        time: z.number(),
-                        params: z.object({
-                            owner: z.string(),
-                            repo: z.string(),
-                            count: z.number(),
-                            doIgnoreReleaseCandidates: z.boolean()
-                        }),
-                        result: z.array(
-                            z.object({
-                                tag: z.string(),
-                                version: zSemVer
-                            })
-                        )
-                    })
-                )
-            });
-
-            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
-
-            return id<z.ZodType<TargetType>>(zTargetType);
-        })();
-
-        let cache: Cache;
-
-        try {
-            cache = zCache.parse(cache_json_parsed);
-        } catch {
-            return getResult_currentCache([]);
-        }
-
-        const cacheEntry = cache.entries.find(e => same(e.params, params));
-
-        if (cacheEntry === undefined) {
-            return getResult_currentCache(cache.entries);
-        }
-
-        if (Date.now() - cacheEntry.time > 3_600_000) {
-            return getResult_currentCache(cache.entries.filter(e => e !== cacheEntry));
-        }
-        return {
-            hasCachedResult: true as const,
-            cachedResult: cacheEntry.result
-        };
-    })();
-
-    if (cacheLookupResult.hasCachedResult) {
-        return cacheLookupResult.cachedResult;
-    }
-
-    const { currentCache } = cacheLookupResult;
-
-    getLatestsSemVersionedTag_stateless ??= (() => {
-        const octokit = (() => {
-            const githubToken = process.env.GITHUB_TOKEN;
-
-            const octokit = new Octokit({
-                ...(githubToken === undefined ? {} : { auth: githubToken }),
-                request: {
-                    fetch: (url: string, options?: any) =>
-                        fetch(url, {
-                            ...options,
-                            ...buildContext.fetchOptions
-                        })
-                }
-            });
-
-            return octokit;
-        })();
-
-        const { getLatestsSemVersionedTag } = getLatestsSemVersionedTagFactory({
-            octokit
-        });
-
-        return getLatestsSemVersionedTag;
-    })();
-
-    const result = await getLatestsSemVersionedTag_stateless(params);
-
-    currentCache.entries.push({
-        time: Date.now(),
-        params,
-        result
-    });
-
-    {
-        const dirPath = pathDirname(cacheFilePath);
-
-        if (!fs.existsSync(dirPath)) {
-            fs.mkdirSync(dirPath, { recursive: true });
-        }
-    }
-
-    fs.writeFileSync(cacheFilePath, JSON.stringify(currentCache, null, 2));
-
-    return result;
-}
--- a/src/bin/shared/promptKeycloakVersion.ts
+++ b/src/bin/shared/promptKeycloakVersion.ts
@ -1,32 +1,92 @@
-import {
-    getLatestsSemVersionedTag,
-    type BuildContextLike as BuildContextLike_getLatestsSemVersionedTag
-} from "./getLatestsSemVersionedTag";
+import { getLatestsSemVersionedTagFactory } from "../tools/octokit-addons/getLatestsSemVersionedTag";
+import { Octokit } from "@octokit/rest";
 import cliSelect from "cli-select";
-import { assert } from "tsafe/assert";
 import { SemVer } from "../tools/SemVer";
-import type { BuildContext } from "./buildContext";
-
-export type BuildContextLike = BuildContextLike_getLatestsSemVersionedTag & {};
-
-assert<BuildContext extends BuildContextLike ? true : false>();
+import { join as pathJoin, dirname as pathDirname } from "path";
+import * as fs from "fs";
+import type { ReturnType } from "tsafe";
+import { id } from "tsafe/id";

 export async function promptKeycloakVersion(params: {
    startingFromMajor: number | undefined;
    excludeMajorVersions: number[];
-    buildContext: BuildContextLike;
+    cacheDirPath: string;
 }) {
-    const { startingFromMajor, excludeMajorVersions, buildContext } = params;
+    const { startingFromMajor, excludeMajorVersions, cacheDirPath } = params;
+
+    const { getLatestsSemVersionedTag } = (() => {
+        const { octokit } = (() => {
+            const githubToken = process.env.GITHUB_TOKEN;
+
+            const octokit = new Octokit(
+                githubToken === undefined ? undefined : { auth: githubToken }
+            );
+
+            return { octokit };
+        })();
+
+        const { getLatestsSemVersionedTag } = getLatestsSemVersionedTagFactory({
+            octokit
+        });
+
+        return { getLatestsSemVersionedTag };
+    })();

    const semVersionedTagByMajor = new Map<number, { tag: string; version: SemVer }>();

-    const semVersionedTags = await getLatestsSemVersionedTag({
-        count: 50,
-        owner: "keycloak",
-        repo: "keycloak",
-        doIgnoreReleaseCandidates: true,
-        buildContext
-    });
+    const semVersionedTags = await (async () => {
+        const cacheFilePath = pathJoin(cacheDirPath, "keycloak-versions.json");
+
+        type Cache = {
+            time: number;
+            semVersionedTags: ReturnType<typeof getLatestsSemVersionedTag>;
+        };
+
+        use_cache: {
+            if (!fs.existsSync(cacheFilePath)) {
+                break use_cache;
+            }
+
+            const cache: Cache = JSON.parse(
+                fs.readFileSync(cacheFilePath).toString("utf8")
+            );
+
+            if (Date.now() - cache.time > 3_600_000) {
+                fs.unlinkSync(cacheFilePath);
+                break use_cache;
+            }
+
+            return cache.semVersionedTags;
+        }
+
+        const semVersionedTags = await getLatestsSemVersionedTag({
+            count: 50,
+            owner: "keycloak",
+            repo: "keycloak"
+        });
+
+        {
+            const dirPath = pathDirname(cacheFilePath);
+
+            if (!fs.existsSync(dirPath)) {
+                fs.mkdirSync(dirPath, { recursive: true });
+            }
+        }
+
+        fs.writeFileSync(
+            cacheFilePath,
+            JSON.stringify(
+                id<Cache>({
+                    time: Date.now(),
+                    semVersionedTags
+                }),
+                null,
+                2
+            )
+        );
+
+        return semVersionedTags;
+    })();

    semVersionedTags.forEach(semVersionedTag => {
        if (
@ -55,7 +115,7 @@ export async function promptKeycloakVersion(params: {
    });

    const lastMajorVersions = Array.from(semVersionedTagByMajor.values()).map(
-        ({ version }) => `${version.major}.${version.minor}`
+        ({ tag }) => tag
    );

    const { value } = await cliSelect<string>({
--- a/src/bin/start-keycloak/appBuild.ts
+++ b/src/bin/start-keycloak/appBuild.ts
@ -1,19 +1,17 @@
 import * as child_process from "child_process";
 import { Deferred } from "evt/tools/Deferred";
 import { assert } from "tsafe/assert";
+import { is } from "tsafe/is";
 import type { BuildContext } from "../shared/buildContext";
-import chalk from "chalk";
-import { sep as pathSep, join as pathJoin } from "path";
-import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath";
 import * as fs from "fs";
-import { dirname as pathDirname, relative as pathRelative } from "path";
+import { join as pathJoin } from "path";

 export type BuildContextLike = {
    projectDirPath: string;
    keycloakifyBuildDirPath: string;
-    bundler: BuildContext["bundler"];
+    bundler: "vite" | "webpack";
+    npmWorkspaceRootDirPath: string;
    projectBuildDirPath: string;
-    packageJsonFilePath: string;
 };

 assert<BuildContext extends BuildContextLike ? true : false>();
@ -23,29 +21,95 @@ export async function appBuild(params: {
 }): Promise<{ isAppBuildSuccess: boolean }> {
    const { buildContext } = params;

-    switch (buildContext.bundler) {
-        case "vite":
-            return appBuild_vite({ buildContext });
-        case "webpack":
-            return appBuild_webpack({ buildContext });
-    }
-}
+    const { bundler } = buildContext;

-async function appBuild_vite(params: {
-    buildContext: BuildContextLike;
-}): Promise<{ isAppBuildSuccess: boolean }> {
-    const { buildContext } = params;
+    const { command, args, cwd } = (() => {
+        switch (bundler) {
+            case "vite":
+                return {
+                    command: "npx",
+                    args: ["vite", "build"],
+                    cwd: buildContext.projectDirPath
+                };
+            case "webpack": {
+                for (const dirPath of [
+                    buildContext.projectDirPath,
+                    buildContext.npmWorkspaceRootDirPath
+                ]) {
+                    try {
+                        const parsedPackageJson = JSON.parse(
+                            fs
+                                .readFileSync(pathJoin(dirPath, "package.json"))
+                                .toString("utf8")
+                        );

-    assert(buildContext.bundler === "vite");
+                        const [scriptName] =
+                            Object.entries(parsedPackageJson.scripts).find(
+                                ([, scriptValue]) => {
+                                    assert(is<string>(scriptValue));
+                                    if (
+                                        scriptValue.includes("webpack") &&
+                                        scriptValue.includes("--mode production")
+                                    ) {
+                                        return true;
+                                    }

-    const dIsSuccess = new Deferred<boolean>();
+                                    if (
+                                        scriptValue.includes("react-scripts") &&
+                                        scriptValue.includes("build")
+                                    ) {
+                                        return true;
+                                    }

-    console.log(chalk.blue("$ npx vite build"));
+                                    if (
+                                        scriptValue.includes("react-app-rewired") &&
+                                        scriptValue.includes("build")
+                                    ) {
+                                        return true;
+                                    }

-    const child = child_process.spawn("npx", ["vite", "build"], {
-        cwd: buildContext.projectDirPath,
-        shell: true
-    });
+                                    if (
+                                        scriptValue.includes("craco") &&
+                                        scriptValue.includes("build")
+                                    ) {
+                                        return true;
+                                    }
+
+                                    if (
+                                        scriptValue.includes("ng") &&
+                                        scriptValue.includes("build")
+                                    ) {
+                                        return true;
+                                    }
+
+                                    return false;
+                                }
+                            ) ?? [];
+
+                        if (scriptName === undefined) {
+                            continue;
+                        }
+
+                        return {
+                            command: "npm",
+                            args: ["run", scriptName],
+                            cwd: dirPath
+                        };
+                    } catch {
+                        continue;
+                    }
+                }
+
+                throw new Error(
+                    "Keycloakify was unable to determine which script is responsible for building the app."
+                );
+            }
+        }
+    })();
+
+    const dResult = new Deferred<{ isSuccess: boolean }>();
+
+    const child = child_process.spawn(command, args, { cwd, shell: true });

    child.stdout.on("data", data => {
        if (data.toString("utf8").includes("gzip:")) {
@ -57,128 +121,9 @@ async function appBuild_vite(params: {

    child.stderr.on("data", data => process.stderr.write(data));

-    child.on("exit", code => dIsSuccess.resolve(code === 0));
+    child.on("exit", code => dResult.resolve({ isSuccess: code === 0 }));

-    const isSuccess = await dIsSuccess.pr;
+    const { isSuccess } = await dResult.pr;

    return { isAppBuildSuccess: isSuccess };
 }
-
-async function appBuild_webpack(params: {
-    buildContext: BuildContextLike;
-}): Promise<{ isAppBuildSuccess: boolean }> {
-    const { buildContext } = params;
-
-    assert(buildContext.bundler === "webpack");
-
-    const entries = Object.entries(
-        (JSON.parse(fs.readFileSync(buildContext.packageJsonFilePath).toString("utf8"))
-            .scripts ?? {}) as Record<string, string>
-    ).filter(([, scriptCommand]) => scriptCommand.includes("keycloakify build"));
-
-    if (entries.length === 0) {
-        console.log(
-            chalk.red(
-                [
-                    `You should have a script in your package.json at ${pathRelative(process.cwd(), pathDirname(buildContext.packageJsonFilePath))}`,
-                    `that includes the 'keycloakify build' command`
-                ].join(" ")
-            )
-        );
-        process.exit(-1);
-    }
-
-    const entry =
-        entries.length === 1
-            ? entries[0]
-            : entries.find(([scriptName]) => scriptName === "build-keycloak-theme");
-
-    if (entry === undefined) {
-        console.log(
-            chalk.red(
-                "There's multiple candidate script for building your app, name one 'build-keycloak-theme'"
-            )
-        );
-        process.exit(-1);
-    }
-
-    const [scriptName, scriptCommand] = entry;
-
-    const { appBuildSubCommands } = (() => {
-        const appBuildSubCommands: string[] = [];
-
-        for (const subCmd of scriptCommand.split("&&").map(s => s.trim())) {
-            if (subCmd.includes("keycloakify build")) {
-                break;
-            }
-
-            appBuildSubCommands.push(subCmd);
-        }
-
-        return { appBuildSubCommands };
-    })();
-
-    if (appBuildSubCommands.length === 0) {
-        console.log(
-            chalk.red(
-                `Your ${scriptName} script should look like "... && keycloakify build ..."`
-            )
-        );
-        process.exit(-1);
-    }
-
-    let commandCwd = pathDirname(buildContext.packageJsonFilePath);
-
-    for (const subCommand of appBuildSubCommands) {
-        const dIsSuccess = new Deferred<boolean>();
-
-        const [command, ...args] = subCommand.split(" ");
-
-        if (command === "cd") {
-            const [pathIsh] = args;
-
-            commandCwd = getAbsoluteAndInOsFormatPath({
-                pathIsh,
-                cwd: commandCwd
-            });
-
-            continue;
-        }
-
-        console.log(chalk.blue(`$ ${subCommand}`));
-
-        const child = child_process.spawn(command, args, {
-            cwd: commandCwd,
-            env: {
-                ...process.env,
-                PATH: (() => {
-                    const separator = pathSep === "/" ? ":" : ";";
-
-                    return [
-                        pathJoin(
-                            pathDirname(buildContext.packageJsonFilePath),
-                            "node_modules",
-                            ".bin"
-                        ),
-                        ...(process.env.PATH ?? "").split(separator)
-                    ].join(separator);
-                })()
-            },
-            shell: true
-        });
-
-        child.stdout.on("data", data => process.stdout.write(data));
-
-        child.stderr.on("data", data => process.stderr.write(data));
-
-        child.on("exit", code => dIsSuccess.resolve(code === 0));
-
-        const isSuccess = await dIsSuccess.pr;
-
-        if (!isSuccess) {
-            return { isAppBuildSuccess: false };
-        }
-    }
-
-    return { isAppBuildSuccess: true };
-}
--- a/src/bin/start-keycloak/keycloakifyBuild.ts
+++ b/src/bin/start-keycloak/keycloakifyBuild.ts
@ -1,13 +1,13 @@
-import { BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME } from "../shared/constants";
+import { buildForKeycloakMajorVersionEnvName } from "../shared/constants";
 import * as child_process from "child_process";
 import { Deferred } from "evt/tools/Deferred";
 import { assert } from "tsafe/assert";
 import type { BuildContext } from "../shared/buildContext";
-import chalk from "chalk";

 export type BuildContextLike = {
    projectDirPath: string;
    keycloakifyBuildDirPath: string;
+    bundler: "vite" | "webpack";
 };

 assert<BuildContext extends BuildContextLike ? true : false>();
@ -20,13 +20,11 @@ export async function keycloakifyBuild(params: {

    const dResult = new Deferred<{ isSuccess: boolean }>();

-    console.log(chalk.blue("$ npx keycloakify build"));
-
    const child = child_process.spawn("npx", ["keycloakify", "build"], {
        cwd: buildContext.projectDirPath,
        env: {
            ...process.env,
-            [BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME]: `${buildForKeycloakMajorVersionNumber}`
+            [buildForKeycloakMajorVersionEnvName]: `${buildForKeycloakMajorVersionNumber}`
        },
        shell: true
    });
--- a/src/bin/start-keycloak/myrealm-realm-18.json
+++ b/src/bin/start-keycloak/myrealm-realm-18.json
@ -73,7 +73,7 @@
                "composites": {
                    "realm": ["offline_access", "uma_authorization"],
                    "client": {
-                        "account": ["delete-account", "view-profile", "manage-account"]
+                        "account": ["view-profile", "manage-account"]
                    }
                },
                "clientRole": false,
@ -611,8 +611,8 @@
            "name": "",
            "description": "",
            "rootUrl": "https://my-theme.keycloakify.dev",
-            "adminUrl": "https://my-theme.keycloakify.dev",
-            "baseUrl": "https://my-theme.keycloakify.dev",
+            "adminUrl": "",
+            "baseUrl": "",
            "surrogateAuthRequired": false,
            "enabled": true,
            "alwaysDisplayInConsole": false,
@ -2099,7 +2099,7 @@
            "alias": "delete_account",
            "name": "Delete Account",
            "providerId": "delete_account",
-            "enabled": true,
+            "enabled": false,
            "defaultAction": false,
            "priority": 60,
            "config": {}
--- a/src/bin/start-keycloak/myrealm-realm-19.json
+++ b/src/bin/start-keycloak/myrealm-realm-19.json
@ -73,7 +73,7 @@
                "composites": {
                    "realm": ["offline_access", "uma_authorization"],
                    "client": {
-                        "account": ["delete-account", "view-profile", "manage-account"]
+                        "account": ["view-profile", "manage-account"]
                    }
                },
                "clientRole": false,
@ -618,8 +618,8 @@
            "name": "",
            "description": "",
            "rootUrl": "https://my-theme.keycloakify.dev",
-            "adminUrl": "https://my-theme.keycloakify.dev",
-            "baseUrl": "https://my-theme.keycloakify.dev",
+            "adminUrl": "",
+            "baseUrl": "",
            "surrogateAuthRequired": false,
            "enabled": true,
            "alwaysDisplayInConsole": false,
@ -2130,7 +2130,7 @@
            "alias": "delete_account",
            "name": "Delete Account",
            "providerId": "delete_account",
-            "enabled": true,
+            "enabled": false,
            "defaultAction": false,
            "priority": 60,
            "config": {}
--- a/src/bin/start-keycloak/myrealm-realm-20.json
+++ b/src/bin/start-keycloak/myrealm-realm-20.json
@ -73,7 +73,7 @@
                "composites": {
                    "realm": ["offline_access", "uma_authorization"],
                    "client": {
-                        "account": ["delete-account", "view-profile", "manage-account"]
+                        "account": ["view-profile", "manage-account"]
                    }
                },
                "clientRole": false,
@ -628,8 +628,8 @@
            "name": "",
            "description": "",
            "rootUrl": "https://my-theme.keycloakify.dev",
-            "adminUrl": "https://my-theme.keycloakify.dev",
-            "baseUrl": "https://my-theme.keycloakify.dev",
+            "adminUrl": "",
+            "baseUrl": "",
            "surrogateAuthRequired": false,
            "enabled": true,
            "alwaysDisplayInConsole": false,
@ -2140,7 +2140,7 @@
            "alias": "delete_account",
            "name": "Delete Account",
            "providerId": "delete_account",
-            "enabled": true,
+            "enabled": false,
            "defaultAction": false,
            "priority": 60,
            "config": {}
--- a/src/bin/start-keycloak/myrealm-realm-21.json
+++ b/src/bin/start-keycloak/myrealm-realm-21.json
@ -73,7 +73,7 @@
                "composites": {
                    "realm": ["offline_access", "uma_authorization"],
                    "client": {
-                        "account": ["delete-account", "view-profile", "manage-account"]
+                        "account": ["view-profile", "manage-account"]
                    }
                },
                "clientRole": false,
@ -632,8 +632,8 @@
            "name": "",
            "description": "",
            "rootUrl": "https://my-theme.keycloakify.dev",
-            "adminUrl": "https://my-theme.keycloakify.dev",
-            "baseUrl": "https://my-theme.keycloakify.dev",
+            "adminUrl": "",
+            "baseUrl": "",
            "surrogateAuthRequired": false,
            "enabled": true,
            "alwaysDisplayInConsole": false,
@ -2144,7 +2144,7 @@
            "alias": "delete_account",
            "name": "Delete Account",
            "providerId": "delete_account",
-            "enabled": true,
+            "enabled": false,
            "defaultAction": false,
            "priority": 60,
            "config": {}
--- a/src/bin/start-keycloak/myrealm-realm-23.json
+++ b/src/bin/start-keycloak/myrealm-realm-23.json
@ -55,7 +55,7 @@
                "composites": {
                    "realm": ["offline_access", "uma_authorization"],
                    "client": {
-                        "account": ["delete-account", "view-profile", "manage-account"]
+                        "account": ["view-profile", "manage-account"]
                    }
                },
                "clientRole": false,
@ -644,7 +644,7 @@
            "description": "",
            "rootUrl": "https://my-theme.keycloakify.dev",
            "adminUrl": "https://my-theme.keycloakify.dev",
-            "baseUrl": "https://my-theme.keycloakify.dev",
+            "baseUrl": "",
            "surrogateAuthRequired": false,
            "enabled": true,
            "alwaysDisplayInConsole": false,
@ -2088,7 +2088,7 @@
            "alias": "delete_account",
            "name": "Delete Account",
            "providerId": "delete_account",
-            "enabled": true,
+            "enabled": false,
            "defaultAction": false,
            "priority": 60,
            "config": {}
--- a/src/bin/start-keycloak/myrealm-realm-24.json
+++ b/src/bin/start-keycloak/myrealm-realm-24.json
@ -63,7 +63,7 @@
                "composites": {
                    "realm": ["offline_access", "uma_authorization"],
                    "client": {
-                        "account": ["delete-account", "manage-account", "view-profile"]
+                        "account": ["manage-account", "view-profile"]
                    }
                },
                "clientRole": false,
@ -449,7 +449,7 @@
                "gender": ["prefer_not_to_say"],
                "bio": ["Hello I'm Test User and I do not exist."],
                "phone_number": ["1111111111"],
-                "locale": ["en"],
+                "locale": ["fr"],
                "favorite_media": ["movies", "series"]
            },
            "createdTimestamp": 1716183898408,
@ -653,7 +653,7 @@
            "description": "",
            "rootUrl": "https://my-theme.keycloakify.dev",
            "adminUrl": "https://my-theme.keycloakify.dev",
-            "baseUrl": "https://my-theme.keycloakify.dev",
+            "baseUrl": "",
            "surrogateAuthRequired": false,
            "enabled": true,
            "alwaysDisplayInConsole": false,
@ -2235,7 +2235,7 @@
            "alias": "delete_account",
            "name": "Delete Account",
            "providerId": "delete_account",
-            "enabled": true,
+            "enabled": false,
            "defaultAction": false,
            "priority": 60,
            "config": {}
--- a/src/bin/start-keycloak/myrealm-realm-25.json
+++ b/src/bin/start-keycloak/myrealm-realm-25.json
@ -63,7 +63,7 @@
                "composites": {
                    "realm": ["offline_access", "uma_authorization"],
                    "client": {
-                        "account": ["delete-account", "manage-account", "view-profile"]
+                        "account": ["manage-account", "view-profile"]
                    }
                },
                "clientRole": false,
@ -543,7 +543,7 @@
                "favourite_pet": ["cat"],
                "bio": ["Hello I'm Test User and I do not exist."],
                "phone_number": ["1111111111"],
-                "locale": ["en"],
+                "locale": ["fr"],
                "favorite_media": ["movies", "series"]
            },
            "createdTimestamp": 1716183898408,
@ -767,7 +767,7 @@
            "description": "",
            "rootUrl": "https://my-theme.keycloakify.dev",
            "adminUrl": "https://my-theme.keycloakify.dev",
-            "baseUrl": "https://my-theme.keycloakify.dev",
+            "baseUrl": "",
            "surrogateAuthRequired": false,
            "enabled": true,
            "alwaysDisplayInConsole": false,
@ -2315,7 +2315,7 @@
            "alias": "delete_account",
            "name": "Delete Account",
            "providerId": "delete_account",
-            "enabled": true,
+            "enabled": false,
            "defaultAction": false,
            "priority": 60,
            "config": {}
--- a/src/bin/start-keycloak/start-keycloak.ts
+++ b/src/bin/start-keycloak/start-keycloak.ts
@ -2,16 +2,15 @@ import { getBuildContext } from "../shared/buildContext";
 import { exclude } from "tsafe/exclude";
 import type { CliCommandOptions as CliCommandOptions_common } from "../main";
 import { promptKeycloakVersion } from "../shared/promptKeycloakVersion";
-import { ACCOUNT_V1_THEME_NAME, CONTAINER_NAME } from "../shared/constants";
+import { accountV1ThemeName, containerName } from "../shared/constants";
 import { SemVer } from "../tools/SemVer";
-import { assert, type Equals } from "tsafe/assert";
+import { assert } from "tsafe/assert";
 import * as fs from "fs";
 import {
    join as pathJoin,
    relative as pathRelative,
    sep as pathSep,
-    basename as pathBasename,
-    dirname as pathDirname
+    basename as pathBasename
 } from "path";
 import * as child_process from "child_process";
 import chalk from "chalk";
@ -27,10 +26,9 @@ import { keycloakifyBuild } from "./keycloakifyBuild";
 import { isInside } from "../tools/isInside";
 import { existsAsync } from "../tools/fs.existsAsync";
 import { rm } from "../tools/fs.rm";
-import { downloadAndExtractArchive } from "../tools/downloadAndExtractArchive";

 export type CliCommandOptions = CliCommandOptions_common & {
-    port: number | undefined;
+    port: number;
    keycloakVersion: string | undefined;
    realmJsonFilePath: string | undefined;
 };
@ -90,65 +88,30 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })

    const buildContext = getBuildContext({ cliCommandOptions });

-    const { dockerImageTag } = await (async () => {
+    const { keycloakVersion } = await (async () => {
        if (cliCommandOptions.keycloakVersion !== undefined) {
-            return { dockerImageTag: cliCommandOptions.keycloakVersion };
-        }
-
-        if (buildContext.startKeycloakOptions.dockerImage !== undefined) {
            return {
-                dockerImageTag: buildContext.startKeycloakOptions.dockerImage.tag
+                keycloakVersion: cliCommandOptions.keycloakVersion,
+                keycloakMajorNumber: SemVer.parse(cliCommandOptions.keycloakVersion).major
            };
        }

        console.log(
-            [
-                chalk.cyan(
-                    "On which version of Keycloak do you want to test your theme?"
-                ),
-                chalk.gray(
-                    "You can also explicitly provide the version with `npx keycloakify start-keycloak --keycloak-version 25.0.2` (or any other version)"
-                )
-            ].join("\n")
+            chalk.cyan("On which version of Keycloak do you want to test your theme?")
        );

        const { keycloakVersion } = await promptKeycloakVersion({
            startingFromMajor: 18,
            excludeMajorVersions: [22],
-            buildContext
+            cacheDirPath: buildContext.cacheDirPath
        });

        console.log(`→ ${keycloakVersion}`);

-        return { dockerImageTag: keycloakVersion };
+        return { keycloakVersion };
    })();

-    const keycloakMajorVersionNumber = (() => {
-        if (buildContext.startKeycloakOptions.dockerImage === undefined) {
-            return SemVer.parse(dockerImageTag).major;
-        }
-
-        const { tag } = buildContext.startKeycloakOptions.dockerImage;
-
-        const [wrap] = [18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28]
-            .map(majorVersionNumber => ({
-                majorVersionNumber,
-                index: tag.indexOf(`${majorVersionNumber}`)
-            }))
-            .filter(({ index }) => index !== -1)
-            .sort((a, b) => a.index - b.index);
-
-        if (wrap === undefined) {
-            console.warn(
-                chalk.yellow(
-                    `Could not determine the major Keycloak version number from the docker image tag ${tag}. Assuming 25`
-                )
-            );
-            return 25;
-        }
-
-        return wrap.majorVersionNumber;
-    })();
+    const keycloakMajorVersionNumber = SemVer.parse(keycloakVersion).major;

    {
        const { isAppBuildSuccess } = await appBuild({
@ -158,7 +121,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
        if (!isAppBuildSuccess) {
            console.log(
                chalk.red(
-                    `App build failed, exiting. Try building your app (e.g 'npm run build') and see what's wrong.`
+                    `App build failed, exiting. Try running 'npm run build' and see what's wrong.`
                )
            );
            process.exit(1);
@ -187,68 +150,41 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })

    assert(jarFilePath !== undefined);

-    const extensionJarFilePaths = await Promise.all(
-        buildContext.startKeycloakOptions.extensionJars.map(async extensionJar => {
-            switch (extensionJar.type) {
-                case "path": {
-                    assert(
-                        await existsAsync(extensionJar.path),
-                        `${extensionJar.path} does not exist`
-                    );
-                    return extensionJar.path;
-                }
-                case "url": {
-                    const { archiveFilePath } = await downloadAndExtractArchive({
-                        cacheDirPath: buildContext.cacheDirPath,
-                        fetchOptions: buildContext.fetchOptions,
-                        url: extensionJar.url,
-                        uniqueIdOfOnArchiveFile: "no extraction",
-                        onArchiveFile: async () => {}
-                    });
-                    return archiveFilePath;
-                }
-            }
-            assert<Equals<typeof extensionJar, never>>(false);
-        })
-    );
-
-    const getRealmJsonFilePath_defaultForKeycloakMajor = (
-        keycloakMajorVersionNumber: number
-    ) =>
-        pathJoin(
-            getThisCodebaseRootDirPath(),
-            "src",
-            "bin",
-            "start-keycloak",
-            `myrealm-realm-${keycloakMajorVersionNumber}.json`
-        );
+    console.log(`Using ${chalk.bold(pathBasename(jarFilePath))}`);

    const realmJsonFilePath = await (async () => {
        if (cliCommandOptions.realmJsonFilePath !== undefined) {
            if (cliCommandOptions.realmJsonFilePath === "none") {
                return undefined;
            }
+
+            console.log(
+                chalk.green(
+                    `Using realm json file: ${cliCommandOptions.realmJsonFilePath}`
+                )
+            );
+
            return getAbsoluteAndInOsFormatPath({
                pathIsh: cliCommandOptions.realmJsonFilePath,
                cwd: process.cwd()
            });
        }

-        if (buildContext.startKeycloakOptions.realmJsonFilePath !== undefined) {
-            assert(
-                await existsAsync(buildContext.startKeycloakOptions.realmJsonFilePath),
-                `${pathRelative(process.cwd(), buildContext.startKeycloakOptions.realmJsonFilePath)} does not exist`
-            );
-            return buildContext.startKeycloakOptions.realmJsonFilePath;
-        }
-
        const internalFilePath = await (async () => {
-            const defaultFilePath = getRealmJsonFilePath_defaultForKeycloakMajor(
-                keycloakMajorVersionNumber
+            const dirPath = pathJoin(
+                getThisCodebaseRootDirPath(),
+                "src",
+                "bin",
+                "start-keycloak"
            );

-            if (fs.existsSync(defaultFilePath)) {
-                return defaultFilePath;
+            const filePath = pathJoin(
+                dirPath,
+                `myrealm-realm-${keycloakMajorVersionNumber}.json`
+            );
+
+            if (fs.existsSync(filePath)) {
+                return filePath;
            }

            console.log(
@ -259,8 +195,6 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })

            console.log(chalk.cyan("Select what configuration to use:"));

-            const dirPath = pathDirname(defaultFilePath);
-
            const { value } = await cliSelect<string>({
                values: [
                    ...fs
@ -302,40 +236,6 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
        return filePath;
    })();

-    add_test_user_if_missing: {
-        if (realmJsonFilePath === undefined) {
-            break add_test_user_if_missing;
-        }
-
-        const realm: Record<string, unknown> = JSON.parse(
-            fs.readFileSync(realmJsonFilePath).toString("utf8")
-        );
-
-        if (realm.users !== undefined) {
-            break add_test_user_if_missing;
-        }
-
-        const realmJsonFilePath_internal = (() => {
-            const filePath = getRealmJsonFilePath_defaultForKeycloakMajor(
-                keycloakMajorVersionNumber
-            );
-
-            if (!fs.existsSync(filePath)) {
-                return getRealmJsonFilePath_defaultForKeycloakMajor(25);
-            }
-
-            return filePath;
-        })();
-
-        const users = JSON.parse(
-            fs.readFileSync(realmJsonFilePath_internal).toString("utf8")
-        ).users;
-
-        realm.users = users;
-
-        fs.writeFileSync(realmJsonFilePath, JSON.stringify(realm, null, 2), "utf8");
-    }
-
    async function extractThemeResourcesFromJar() {
        await extractArchive({
            archiveFilePath: jarFilePath,
@ -369,110 +269,82 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
    fs.copyFileSync(jarFilePath, jarFilePath_cacheDir);

    try {
-        child_process.execSync(`docker rm --force ${CONTAINER_NAME}`, {
+        child_process.execSync(`docker rm --force ${containerName}`, {
            stdio: "ignore"
        });
    } catch {}

-    const DEFAULT_PORT = 8080;
-    const port =
-        cliCommandOptions.port ?? buildContext.startKeycloakOptions.port ?? DEFAULT_PORT;
-
-    const SPACE_PLACEHOLDER = "SPACE_PLACEHOLDER_xKLmdPd";
-
-    const dockerRunArgs: string[] = [
-        `-p${SPACE_PLACEHOLDER}${port}:8080`,
-        `--name${SPACE_PLACEHOLDER}${CONTAINER_NAME}`,
-        `-e${SPACE_PLACEHOLDER}KEYCLOAK_ADMIN=admin`,
-        `-e${SPACE_PLACEHOLDER}KEYCLOAK_ADMIN_PASSWORD=admin`,
-        ...(buildContext.startKeycloakOptions.dockerExtraArgs.length === 0
-            ? []
-            : [
-                  buildContext.startKeycloakOptions.dockerExtraArgs.join(
-                      SPACE_PLACEHOLDER
-                  )
-              ]),
-        ...(realmJsonFilePath === undefined
-            ? []
-            : [
-                  `-v${SPACE_PLACEHOLDER}".${pathSep}${pathRelative(process.cwd(), realmJsonFilePath)}":/opt/keycloak/data/import/myrealm-realm.json`
-              ]),
-        `-v${SPACE_PLACEHOLDER}".${pathSep}${pathRelative(process.cwd(), jarFilePath_cacheDir)}":/opt/keycloak/providers/keycloak-theme.jar`,
-        ...extensionJarFilePaths.map(
-            jarFilePath =>
-                `-v${SPACE_PLACEHOLDER}".${pathSep}${pathRelative(process.cwd(), jarFilePath)}":/opt/keycloak/providers/${pathBasename(jarFilePath)}`
-        ),
-        ...(keycloakMajorVersionNumber <= 20
-            ? [`-e${SPACE_PLACEHOLDER}JAVA_OPTS=-Dkeycloak.profile=preview`]
-            : []),
-        ...[
-            ...buildContext.themeNames,
-            ...(fs.existsSync(
-                pathJoin(
-                    buildContext.keycloakifyBuildDirPath,
-                    "theme",
-                    ACCOUNT_V1_THEME_NAME
-                )
-            )
-                ? [ACCOUNT_V1_THEME_NAME]
-                : [])
-        ]
-            .map(themeName => ({
-                localDirPath: pathJoin(
-                    buildContext.keycloakifyBuildDirPath,
-                    "theme",
-                    themeName
-                ),
-                containerDirPath: `/opt/keycloak/themes/${themeName}`
-            }))
-            .map(
-                ({ localDirPath, containerDirPath }) =>
-                    `-v${SPACE_PLACEHOLDER}".${pathSep}${pathRelative(process.cwd(), localDirPath)}":${containerDirPath}:rw`
-            ),
-        ...buildContext.environmentVariables
-            .map(({ name }) => ({ name, envValue: process.env[name] }))
-            .map(({ name, envValue }) =>
-                envValue === undefined ? undefined : { name, envValue }
-            )
-            .filter(exclude(undefined))
-            .map(
-                ({ name, envValue }) =>
-                    `--env${SPACE_PLACEHOLDER}${name}='${envValue.replace(/'/g, "'\\''")}'`
-            ),
-        `${buildContext.startKeycloakOptions.dockerImage?.reference ?? "quay.io/keycloak/keycloak"}:${dockerImageTag}`,
-        "start-dev",
-        ...(21 <= keycloakMajorVersionNumber && keycloakMajorVersionNumber < 24
-            ? ["--features=declarative-user-profile"]
-            : []),
-        ...(realmJsonFilePath === undefined ? [] : ["--import-realm"]),
-        ...(buildContext.startKeycloakOptions.keycloakExtraArgs.length === 0
-            ? []
-            : [
-                  buildContext.startKeycloakOptions.keycloakExtraArgs.join(
-                      SPACE_PLACEHOLDER
-                  )
-              ])
-    ];
-
-    console.log(
-        chalk.blue(
-            [
-                `$ docker run \\`,
-                ...dockerRunArgs
-                    .map(arg => arg.replace(new RegExp(SPACE_PLACEHOLDER, "g"), " "))
-                    .map(
-                        (line, i, arr) =>
-                            `    ${line}${arr.length - 1 === i ? "" : " \\"}`
-                    )
-            ].join("\n")
-        )
-    );
-
-    const child = child_process.spawn(
+    const spawnArgs = [
        "docker",
-        ["run", ...dockerRunArgs.map(line => line.split(SPACE_PLACEHOLDER)).flat()],
-        { shell: true }
-    );
+        [
+            "run",
+            ...["-p", `${cliCommandOptions.port}:8080`],
+            ...["--name", containerName],
+            ...["-e", "KEYCLOAK_ADMIN=admin"],
+            ...["-e", "KEYCLOAK_ADMIN_PASSWORD=admin"],
+            ...(realmJsonFilePath === undefined
+                ? []
+                : [
+                      "-v",
+                      `${realmJsonFilePath}:/opt/keycloak/data/import/myrealm-realm.json`
+                  ]),
+            ...[
+                "-v",
+                `${jarFilePath_cacheDir}:/opt/keycloak/providers/keycloak-theme.jar`
+            ],
+            ...(keycloakMajorVersionNumber <= 20
+                ? ["-e", "JAVA_OPTS=-Dkeycloak.profile=preview"]
+                : []),
+            ...[
+                ...buildContext.themeNames,
+                ...(fs.existsSync(
+                    pathJoin(
+                        buildContext.keycloakifyBuildDirPath,
+                        "theme",
+                        accountV1ThemeName
+                    )
+                )
+                    ? [accountV1ThemeName]
+                    : [])
+            ]
+                .map(themeName => ({
+                    localDirPath: pathJoin(
+                        buildContext.keycloakifyBuildDirPath,
+                        "theme",
+                        themeName
+                    ),
+                    containerDirPath: `/opt/keycloak/themes/${themeName}`
+                }))
+                .map(({ localDirPath, containerDirPath }) => [
+                    "-v",
+                    `${localDirPath}:${containerDirPath}:rw`
+                ])
+                .flat(),
+            ...buildContext.environmentVariables
+                .map(({ name }) => ({ name, envValue: process.env[name] }))
+                .map(({ name, envValue }) =>
+                    envValue === undefined ? undefined : { name, envValue }
+                )
+                .filter(exclude(undefined))
+                .map(({ name, envValue }) => [
+                    "--env",
+                    `${name}='${envValue.replace(/'/g, "'\\''")}'`
+                ])
+                .flat(),
+            `quay.io/keycloak/keycloak:${keycloakVersion}`,
+            "start-dev",
+            ...(21 <= keycloakMajorVersionNumber && keycloakMajorVersionNumber < 24
+                ? ["--features=declarative-user-profile"]
+                : []),
+            ...(realmJsonFilePath === undefined ? [] : ["--import-realm"])
+        ],
+        {
+            cwd: buildContext.keycloakifyBuildDirPath,
+            shell: true
+        }
+    ] as const;
+
+    const child = child_process.spawn(...spawnArgs);

    child.stdout.on("data", data => process.stdout.write(data));

@ -483,18 +355,6 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
    const srcDirPath = pathJoin(buildContext.projectDirPath, "src");

    {
-        const kcHttpRelativePath = (() => {
-            const match = buildContext.startKeycloakOptions.dockerExtraArgs
-                .join(" ")
-                .match(/KC_HTTP_RELATIVE_PATH=([^ ]+)/);
-
-            if (match === null) {
-                return undefined;
-            }
-
-            return match[1];
-        })();
-
        const handler = async (data: Buffer) => {
            if (!data.toString("utf8").includes("Listening on: http://0.0.0.0:8080")) {
                return;
@ -512,7 +372,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                    )} are mounted in the Keycloak container.`,
                    "",
                    `Keycloak Admin console: ${chalk.cyan.bold(
-                        `http://localhost:${port}${kcHttpRelativePath ?? ""}`
+                        `http://localhost:${cliCommandOptions.port}`
                    )}`,
                    `- user:     ${chalk.cyan.bold("admin")}`,
                    `- password: ${chalk.cyan.bold("admin")}`,
@ -520,21 +380,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
                    "",
                    `${chalk.green("Your theme is accessible at:")}`,
                    `${chalk.green("➜")} ${chalk.cyan.bold(
-                        (() => {
-                            const url = new URL("https://my-theme.keycloakify.dev");
-
-                            if (port !== DEFAULT_PORT) {
-                                url.searchParams.set("port", `${port}`);
-                            }
-                            if (kcHttpRelativePath !== undefined) {
-                                url.searchParams.set(
-                                    "kcHttpRelativePath",
-                                    kcHttpRelativePath
-                                );
-                            }
-
-                            return url.href;
-                        })()
+                        `https://my-theme.keycloakify.dev${cliCommandOptions.port === 8080 ? "" : `?port=${cliCommandOptions.port}`}`
                    )}`,
                    "",
                    "You can login with the following credentials:",
--- a/src/bin/tools/assertNoPnpmDlx.ts
+++ b/src/bin/tools/assertNoPnpmDlx.ts
@ -1,17 +0,0 @@
-import { sep as pathSep } from "path";
-import chalk from "chalk";
-
-export function assertNoPnpmDlx() {
-    if (__dirname.includes(`${pathSep}pnpm${pathSep}dlx${pathSep}`)) {
-        console.log(
-            [
-                chalk.red(
-                    "Please don't use `pnpm dlx keycloakify` (download and execute)"
-                ),
-                "\nUse `npx keycloakify` or `pnpm exec keycloakify` instead since you want to use the keycloakify",
-                "version that is installed in your project and not download and run the latest NPM version of keycloakify."
-            ].join(" ")
-        );
-        process.exit(1);
-    }
-}
--- a/src/bin/tools/downloadAndExtractArchive/downloadAndExtractArchive.ts
+++ b/src/bin/tools/downloadAndExtractArchive/downloadAndExtractArchive.ts
@ -1,15 +1,16 @@
-import fetch, { type FetchOptions } from "make-fetch-happen";
+import fetch from "make-fetch-happen";
 import { mkdir, unlink, writeFile, readdir, readFile } from "fs/promises";
 import { dirname as pathDirname, join as pathJoin } from "path";
 import { assert } from "tsafe/assert";
-import { extractArchive } from "./extractArchive";
-import { existsAsync } from "./fs.existsAsync";
+import { extractArchive } from "../extractArchive";
+import { existsAsync } from "../fs.existsAsync";
+import { getProxyFetchOptions } from "./fetchProxyOptions";
 import * as crypto from "crypto";
-import { rm } from "./fs.rm";
+import { rm } from "../fs.rm";

 export async function downloadAndExtractArchive(params: {
    url: string;
-    uniqueIdOfOnArchiveFile: string;
+    uniqueIdOfOnOnArchiveFile: string;
    onArchiveFile: (params: {
        fileRelativePath: string;
        readFile: () => Promise<Buffer>;
@ -19,18 +20,21 @@ export async function downloadAndExtractArchive(params: {
        }) => Promise<void>;
    }) => Promise<void>;
    cacheDirPath: string;
-    fetchOptions: FetchOptions | undefined;
-}): Promise<{ extractedDirPath: string; archiveFilePath: string }> {
-    const { url, uniqueIdOfOnArchiveFile, onArchiveFile, cacheDirPath, fetchOptions } =
-        params;
+    npmWorkspaceRootDirPath: string;
+}): Promise<{ extractedDirPath: string }> {
+    const {
+        url,
+        uniqueIdOfOnOnArchiveFile,
+        onArchiveFile,
+        cacheDirPath,
+        npmWorkspaceRootDirPath
+    } = params;

    const archiveFileBasename = url.split("?")[0].split("/").reverse()[0];

    const archiveFilePath = pathJoin(cacheDirPath, archiveFileBasename);

    download: {
-        await mkdir(pathDirname(archiveFilePath), { recursive: true });
-
        if (await existsAsync(archiveFilePath)) {
            const isDownloaded = await SuccessTracker.getIsDownloaded({
                cacheDirPath,
@ -49,7 +53,12 @@ export async function downloadAndExtractArchive(params: {
            });
        }

-        const response = await fetch(url, fetchOptions);
+        await mkdir(pathDirname(archiveFilePath), { recursive: true });
+
+        const response = await fetch(
+            url,
+            await getProxyFetchOptions({ npmWorkspaceRootDirPath })
+        );

        response.body?.setMaxListeners(Number.MAX_VALUE);
        assert(typeof response.body !== "undefined" && response.body != null);
@ -62,7 +71,7 @@ export async function downloadAndExtractArchive(params: {
        });
    }

-    const extractDirBasename = `${archiveFileBasename.replace(/\.([^.]+)$/, (...[, ext]) => `_${ext}`)}_${uniqueIdOfOnArchiveFile}_${crypto
+    const extractDirBasename = `${archiveFileBasename.split(".")[0]}_${uniqueIdOfOnOnArchiveFile}_${crypto
        .createHash("sha256")
        .update(onArchiveFile.toString())
        .digest("hex")
@ -84,9 +93,7 @@ export async function downloadAndExtractArchive(params: {
                })()
            )
            .map(async extractDirBasename => {
-                await rm(pathJoin(cacheDirPath, extractDirBasename), {
-                    recursive: true
-                });
+                await rm(pathJoin(cacheDirPath, extractDirBasename), { recursive: true });
                await SuccessTracker.removeFromExtracted({
                    cacheDirPath,
                    extractDirBasename
@ -135,7 +142,7 @@ export async function downloadAndExtractArchive(params: {
        });
    }

-    return { extractedDirPath, archiveFilePath };
+    return { extractedDirPath };
 }

 type SuccessTracker = {
--- a/src/bin/tools/downloadAndExtractArchive/fetchProxyOptions.ts
+++ b/src/bin/tools/downloadAndExtractArchive/fetchProxyOptions.ts
@ -0,0 +1,104 @@
+import { exec as execCallback } from "child_process";
+import { readFile } from "fs/promises";
+import { type FetchOptions } from "make-fetch-happen";
+import { promisify } from "util";
+
+function ensureArray<T>(arg0: T | T[]) {
+    return Array.isArray(arg0) ? arg0 : typeof arg0 === "undefined" ? [] : [arg0];
+}
+
+function ensureSingleOrNone<T>(arg0: T | T[]) {
+    if (!Array.isArray(arg0)) return arg0;
+    if (arg0.length === 0) return undefined;
+    if (arg0.length === 1) return arg0[0];
+    throw new Error(
+        "Illegal configuration, expected a single value but found multiple: " +
+            arg0.map(String).join(", ")
+    );
+}
+
+type NPMConfig = Record<string, string | string[]>;
+
+/**
+ * Get npm configuration as map
+ */
+async function getNmpConfig(params: { npmWorkspaceRootDirPath: string }) {
+    const { npmWorkspaceRootDirPath } = params;
+
+    const exec = promisify(execCallback);
+
+    const stdout = await exec("npm config get", {
+        encoding: "utf8",
+        cwd: npmWorkspaceRootDirPath
+    }).then(({ stdout }) => stdout);
+
+    const npmConfigReducer = (cfg: NPMConfig, [key, value]: [string, string]) =>
+        key in cfg
+            ? { ...cfg, [key]: [...ensureArray(cfg[key]), value] }
+            : { ...cfg, [key]: value };
+
+    return stdout
+        .split("\n")
+        .filter(line => !line.startsWith(";"))
+        .map(line => line.trim())
+        .map(line => line.split("=", 2) as [string, string])
+        .reduce(npmConfigReducer, {} as NPMConfig);
+}
+
+export type ProxyFetchOptions = Pick<
+    FetchOptions,
+    "proxy" | "noProxy" | "strictSSL" | "cert" | "ca"
+>;
+
+export async function getProxyFetchOptions(params: {
+    npmWorkspaceRootDirPath: string;
+}): Promise<ProxyFetchOptions> {
+    const { npmWorkspaceRootDirPath } = params;
+
+    const cfg = await getNmpConfig({ npmWorkspaceRootDirPath });
+
+    const proxy = ensureSingleOrNone(cfg["https-proxy"] ?? cfg["proxy"]);
+    const noProxy = cfg["noproxy"] ?? cfg["no-proxy"];
+
+    function maybeBoolean(arg0: string | undefined) {
+        return typeof arg0 === "undefined" ? undefined : Boolean(arg0);
+    }
+
+    const strictSSL = maybeBoolean(ensureSingleOrNone(cfg["strict-ssl"]));
+    const cert = cfg["cert"];
+    const ca = ensureArray(cfg["ca"] ?? cfg["ca[]"]);
+    const cafile = ensureSingleOrNone(cfg["cafile"]);
+
+    if (typeof cafile !== "undefined" && cafile !== "null") {
+        ca.push(
+            ...(await (async () => {
+                function chunks<T>(arr: T[], size: number = 2) {
+                    return arr
+                        .map((_, i) => i % size == 0 && arr.slice(i, i + size))
+                        .filter(Boolean) as T[][];
+                }
+
+                const cafileContent = await readFile(cafile, "utf-8");
+
+                const newLinePlaceholder = "NEW_LINE_PLACEHOLDER_xIsPsK23svt";
+
+                return chunks(cafileContent.split(/(-----END CERTIFICATE-----)/), 2).map(
+                    ca =>
+                        ca
+                            .join("")
+                            .replace(/\r?\n/g, newLinePlaceholder)
+                            .replace(new RegExp(`^${newLinePlaceholder}`), "")
+                            .replace(new RegExp(newLinePlaceholder, "g"), "\\n")
+                );
+            })())
+        );
+    }
+
+    return {
+        proxy,
+        noProxy,
+        strictSSL,
+        cert,
+        ca: ca.length === 0 ? undefined : ca
+    };
+}
--- a/src/bin/tools/downloadAndExtractArchive/index.ts
+++ b/src/bin/tools/downloadAndExtractArchive/index.ts
@ -0,0 +1 @@
+export * from "./downloadAndExtractArchive";
--- a/src/bin/tools/fetchProxyOptions.ts
+++ b/src/bin/tools/fetchProxyOptions.ts
@ -1,117 +0,0 @@
-import { type FetchOptions } from "make-fetch-happen";
-import * as child_process from "child_process";
-import * as fs from "fs";
-import { exclude } from "tsafe/exclude";
-
-export type ProxyFetchOptions = Pick<
-    FetchOptions,
-    "proxy" | "noProxy" | "strictSSL" | "cert" | "ca"
->;
-
-export function getProxyFetchOptions(params: {
-    npmConfigGetCwd: string;
-}): ProxyFetchOptions {
-    const { npmConfigGetCwd } = params;
-
-    const cfg = (() => {
-        const output = child_process
-            .execSync("npm config get", {
-                cwd: npmConfigGetCwd
-            })
-            .toString("utf8");
-
-        return output
-            .split("\n")
-            .filter(line => !line.startsWith(";"))
-            .map(line => line.trim())
-            .map(line => {
-                const [key, value] = line.split("=");
-                if (key === undefined) {
-                    return undefined;
-                }
-                if (value === undefined) {
-                    return undefined;
-                }
-                return [key.trim(), value.trim()] as const;
-            })
-            .filter(exclude(undefined))
-            .filter(([key]) => key !== "")
-            .map(([key, value]) => {
-                if (value.startsWith('"') && value.endsWith('"')) {
-                    return [key, value.slice(1, -1)] as const;
-                }
-
-                if (value === "true" || value === "false") {
-                    return [key, value] as const;
-                }
-
-                return undefined;
-            })
-            .filter(exclude(undefined))
-            .reduce(
-                (cfg: Record<string, string | string[]>, [key, value]) =>
-                    key in cfg
-                        ? { ...cfg, [key]: [...ensureArray(cfg[key]), value] }
-                        : { ...cfg, [key]: value },
-                {}
-            );
-    })();
-
-    const proxy = ensureSingleOrNone(cfg["https-proxy"] ?? cfg["proxy"]);
-
-    const noProxy = cfg["noproxy"] ?? cfg["no-proxy"];
-
-    const strictSSL = ensureSingleOrNone(cfg["strict-ssl"]) === "true";
-
-    const cert = cfg["cert"];
-
-    const ca = ensureArray(cfg["ca"] ?? cfg["ca[]"]);
-
-    const cafile = ensureSingleOrNone(cfg["cafile"]);
-
-    if (cafile !== undefined) {
-        ca.push(
-            ...(() => {
-                const cafileContent = fs.readFileSync(cafile).toString("utf8");
-
-                const newLinePlaceholder = "NEW_LINE_PLACEHOLDER_xIsPsK23svt";
-
-                const chunks = <T>(arr: T[], size: number = 2) =>
-                    arr
-                        .map((_, i) => i % size == 0 && arr.slice(i, i + size))
-                        .filter(Boolean) as T[][];
-
-                return chunks(cafileContent.split(/(-----END CERTIFICATE-----)/), 2).map(
-                    ca =>
-                        ca
-                            .join("")
-                            .replace(/\r?\n/g, newLinePlaceholder)
-                            .replace(new RegExp(`^${newLinePlaceholder}`), "")
-                            .replace(new RegExp(newLinePlaceholder, "g"), "\\n")
-                );
-            })()
-        );
-    }
-
-    return {
-        proxy,
-        noProxy,
-        strictSSL,
-        cert,
-        ca: ca.length === 0 ? undefined : ca
-    };
-}
-
-function ensureArray<T>(arg0: T | T[]) {
-    return Array.isArray(arg0) ? arg0 : arg0 === undefined ? [] : [arg0];
-}
-
-function ensureSingleOrNone<T>(arg0: T | T[]) {
-    if (!Array.isArray(arg0)) return arg0;
-    if (arg0.length === 0) return undefined;
-    if (arg0.length === 1) return arg0[0];
-    throw new Error(
-        "Illegal configuration, expected a single value but found multiple: " +
-            arg0.map(String).join(", ")
-    );
-}
--- a/src/bin/tools/getNpmWorkspaceRootDirPath.ts
+++ b/src/bin/tools/getNpmWorkspaceRootDirPath.ts
@ -0,0 +1,84 @@
+import * as child_process from "child_process";
+import { join as pathJoin, resolve as pathResolve, sep as pathSep } from "path";
+import { assert } from "tsafe/assert";
+import * as fs from "fs";
+
+export function getNpmWorkspaceRootDirPath(params: {
+    projectDirPath: string;
+    dependencyExpected: string;
+}) {
+    const { projectDirPath, dependencyExpected } = params;
+
+    console.log("DEBUG getNpmWorkspaceRootDirPath:", {
+        projectDirPath,
+        dependencyExpected
+    });
+
+    const npmWorkspaceRootDirPath = (function callee(depth: number): string {
+        const cwd = pathResolve(
+            pathJoin(...[projectDirPath, ...Array(depth).fill("..")])
+        );
+
+        console.log("DEBUG getNpmWorkspaceRootDirPath:", { cwd });
+
+        assert(cwd !== pathSep, "NPM workspace not found");
+
+        try {
+            child_process.execSync("npm config get", {
+                cwd,
+                stdio: "ignore"
+            });
+        } catch (error) {
+            console.log("DEBUG getNpmWorkspaceRootDirPath: got error npm config get");
+
+            if (String(error).includes("ENOWORKSPACES")) {
+                return callee(depth + 1);
+            }
+
+            throw error;
+        }
+
+        console.log("DEBUG getNpmWorkspaceRootDirPath: npm workspace found");
+
+        const packageJsonFilePath = pathJoin(cwd, "package.json");
+
+        if (!fs.existsSync(packageJsonFilePath)) {
+            return callee(depth + 1);
+        }
+
+        assert(fs.existsSync(packageJsonFilePath));
+
+        const parsedPackageJson = JSON.parse(
+            fs.readFileSync(packageJsonFilePath).toString("utf8")
+        );
+
+        let isExpectedDependencyFound = false;
+
+        for (const dependenciesOrDevDependencies of [
+            "dependencies",
+            "devDependencies"
+        ] as const) {
+            const dependencies = parsedPackageJson[dependenciesOrDevDependencies];
+
+            if (dependencies === undefined) {
+                continue;
+            }
+
+            assert(dependencies instanceof Object);
+
+            if (dependencies[dependencyExpected] === undefined) {
+                continue;
+            }
+
+            isExpectedDependencyFound = true;
+        }
+
+        if (!isExpectedDependencyFound && parsedPackageJson.name !== dependencyExpected) {
+            return callee(depth + 1);
+        }
+
+        return cwd;
+    })(0);
+
+    return { npmWorkspaceRootDirPath };
+}
--- a/src/bin/tools/npmInstall.ts
+++ b/src/bin/tools/npmInstall.ts
@ -1,63 +0,0 @@
-import * as fs from "fs";
-import { join as pathJoin } from "path";
-import * as child_process from "child_process";
-import chalk from "chalk";
-
-export function npmInstall(params: { packageJsonDirPath: string }) {
-    const { packageJsonDirPath } = params;
-
-    const packageManagerBinName = (() => {
-        const packageMangers = [
-            {
-                binName: "yarn",
-                lockFileBasename: "yarn.lock"
-            },
-            {
-                binName: "npm",
-                lockFileBasename: "package-lock.json"
-            },
-            {
-                binName: "pnpm",
-                lockFileBasename: "pnpm-lock.yaml"
-            },
-            {
-                binName: "bun",
-                lockFileBasename: "bun.lockdb"
-            }
-        ] as const;
-
-        for (const packageManager of packageMangers) {
-            if (
-                fs.existsSync(
-                    pathJoin(packageJsonDirPath, packageManager.lockFileBasename)
-                ) ||
-                fs.existsSync(pathJoin(process.cwd(), packageManager.lockFileBasename))
-            ) {
-                return packageManager.binName;
-            }
-        }
-
-        return undefined;
-    })();
-
-    install_dependencies: {
-        if (packageManagerBinName === undefined) {
-            break install_dependencies;
-        }
-
-        console.log(`Installing the new dependencies...`);
-
-        try {
-            child_process.execSync(`${packageManagerBinName} install`, {
-                cwd: packageJsonDirPath,
-                stdio: "inherit"
-            });
-        } catch {
-            console.log(
-                chalk.yellow(
-                    `\`${packageManagerBinName} install\` failed, continuing anyway...`
-                )
-            );
-        }
-    }
-}
--- a/src/bin/tools/octokit-addons/getLatestsSemVersionedTag.ts
+++ b/src/bin/tools/octokit-addons/getLatestsSemVersionedTag.ts
@ -9,14 +9,13 @@ export function getLatestsSemVersionedTagFactory(params: { octokit: Octokit }) {
        owner: string;
        repo: string;
        count: number;
-        doIgnoreReleaseCandidates: boolean;
    }): Promise<
        {
            tag: string;
            version: SemVer;
        }[]
    > {
-        const { owner, repo, count, doIgnoreReleaseCandidates } = params;
+        const { owner, repo, count } = params;

        const semVersionedTags: { tag: string; version: SemVer }[] = [];

@ -31,7 +30,7 @@ export function getLatestsSemVersionedTagFactory(params: { octokit: Octokit }) {
                continue;
            }

-            if (doIgnoreReleaseCandidates && version.rc !== undefined) {
+            if (version.rc !== undefined) {
                continue;
            }

--- a/src/bin/tsconfig.json
+++ b/src/bin/tsconfig.json
@ -8,7 +8,5 @@
        "moduleResolution": "node",
        "outDir": "../../dist/bin",
        "rootDir": "."
-    },
-    "include": ["**/*.ts", "**/*.tsx"],
-    "exclude": ["initialize-account-theme/src"]
+    }
 }
--- a/src/lib/getKcClsx.ts
+++ b/src/lib/getKcClsx.ts
@ -73,8 +73,8 @@ export function createGetKcClsx<ClassKey extends string>(params: {

                    return clsx(
                        classKey,
-                        classes?.[classKey] ??
-                            (doUseDefaultCss ? defaultClasses[classKey] : undefined)
+                        doUseDefaultCss ? defaultClasses[classKey] : undefined,
+                        classes?.[classKey]
                    );
                }
            });
--- a/src/login/KcContext/KcContext.ts
+++ b/src/login/KcContext/KcContext.ts
@ -1,8 +1,9 @@
 import type { ThemeType, LoginThemePageId } from "keycloakify/bin/shared/constants";
+import type { ExtractAfterStartingWith } from "keycloakify/tools/ExtractAfterStartingWith";
 import type { ValueOf } from "keycloakify/tools/ValueOf";
 import { assert } from "tsafe/assert";
 import type { Equals } from "tsafe";
-import type { ClassKey } from "keycloakify/login/TemplateProps";
+import type { MessageKey } from "../i18n/i18n";

 export type ExtendKcContext<
    KcContextExtension extends { properties?: Record<string, string | undefined> },
@ -79,8 +80,8 @@ export declare namespace KcContext {
        };
        realm: {
            name: string;
-            displayName: string;
-            displayNameHtml: string;
+            displayName?: string;
+            displayNameHtml?: string;
            internationalizationEnabled: boolean;
            registrationEmailAsUsername: boolean;
        };
@ -154,7 +155,8 @@ export declare namespace KcContext {
        };
        properties: {};
        "x-keycloakify": {
-            messages: Record<string, string>;
+            realmMessageBundleUserProfile: Record<string, string> | undefined;
+            realmMessageBundleTermsText: string | undefined;
        };
    };

@ -219,7 +221,7 @@ export declare namespace KcContext {
    export type Info = Common & {
        pageId: "info.ftl";
        messageHeader?: string;
-        requiredActions?: string[];
+        requiredActions?: ExtractAfterStartingWith<"requiredAction.", MessageKey>[];
        skipLink: boolean;
        pageRedirectUri?: string;
        actionUri?: string;
@ -382,7 +384,7 @@ export declare namespace KcContext {
            credentialId: string;
            transports: {
                iconClass: string;
-                displayNameProperties?: string[];
+                displayNameProperties?: MessageKey[];
            };
            label: string;
            createdAt: string;
@ -499,9 +501,26 @@ export declare namespace KcContext {
    export namespace SelectAuthenticator {
        export type AuthenticationSelection = {
            authExecId: string;
-            displayName: string;
-            helpText: string;
-            iconCssClass?: ClassKey;
+            displayName:
+                | "otp-display-name"
+                | "password-display-name"
+                | "auth-username-form-display-name"
+                | "auth-username-password-form-display-name"
+                | "webauthn-display-name"
+                | "webauthn-passwordless-display-name";
+            helpText:
+                | "otp-help-text"
+                | "password-help-text"
+                | "auth-username-form-help-text"
+                | "auth-username-password-form-help-text"
+                | "webauthn-help-text"
+                | "webauthn-passwordless-help-text";
+            iconCssClass?:
+                | "kcAuthenticatorDefaultClass"
+                | "kcAuthenticatorPasswordClass"
+                | "kcAuthenticatorOTPClass"
+                | "kcAuthenticatorWebAuthnClass"
+                | "kcAuthenticatorWebAuthnPasswordlessClass";
        };
    }

@ -591,7 +610,6 @@ export type Attribute = {
    value?: string;
    values?: string[];
    group?: {
-        annotations: Record<string, string>;
        html5DataAnnotations: Record<string, string>;
        displayHeader?: string;
        name: string;
--- a/src/login/KcContext/kcContextMocks.ts
+++ b/src/login/KcContext/kcContextMocks.ts
@ -1,8 +1,8 @@
 import "keycloakify/tools/Object.fromEntries";
 import type { KcContext, Attribute } from "./KcContext";
 import {
-    RESOURCES_COMMON,
-    KEYCLOAK_RESOURCES,
+    resources_common,
+    keycloak_resources,
    type LoginThemePageId
 } from "keycloakify/bin/shared/constants";
 import { id } from "tsafe/id";
@ -76,7 +76,7 @@ const attributesByName = Object.fromEntries(
    ]).map(attribute => [attribute.name, attribute])
 );

-const resourcesPath = `${BASE_URL}${KEYCLOAK_RESOURCES}/login/resources`;
+const resourcesPath = `${BASE_URL}${keycloak_resources}/login/resources`;

 export const kcContextCommonMock: KcContext.Common = {
    themeVersion: "0.0.0",
@ -86,7 +86,7 @@ export const kcContextCommonMock: KcContext.Common = {
    url: {
        loginAction: "#",
        resourcesPath,
-        resourcesCommonPath: `${resourcesPath}/${RESOURCES_COMMON}`,
+        resourcesCommonPath: `${resourcesPath}/${resources_common}`,
        loginRestartFlowUrl: "#",
        loginUrl: "#",
        ssoLoginInOtherTabsUrl: "#"
@ -162,7 +162,8 @@ export const kcContextCommonMock: KcContext.Common = {
    isAppInitiatedAction: false,
    properties: {},
    "x-keycloakify": {
-        messages: {}
+        realmMessageBundleUserProfile: undefined,
+        realmMessageBundleTermsText: undefined
    }
 };

--- a/src/login/Template.tsx
+++ b/src/login/Template.tsx
@ -15,6 +15,7 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
        displayMessage = true,
        displayRequiredFields = false,
        headerNode,
+        showUsernameNode = null,
        socialProvidersNode = null,
        infoNode = null,
        documentTitle,
@ -163,10 +164,45 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
                            </div>
                        </div>
                    )}
-                    {(() => {
-                        const node = !(auth !== undefined && auth.showUsername && !auth.showResetCredentials) ? (
-                            <h1 id="kc-page-title">{headerNode}</h1>
+                    {!(auth !== undefined && auth.showUsername && !auth.showResetCredentials) ? (
+                        displayRequiredFields ? (
+                            <div className={kcClsx("kcContentWrapperClass")}>
+                                <div className={clsx(kcClsx("kcLabelWrapperClass"), "subtitle")}>
+                                    <span className="subtitle">
+                                        <span className="required">*</span>
+                                        {msg("requiredFields")}
+                                    </span>
+                                </div>
+                                <div className="col-md-10">
+                                    <h1 id="kc-page-title">{headerNode}</h1>
+                                </div>
+                            </div>
                        ) : (
+                            <h1 id="kc-page-title">{headerNode}</h1>
+                        )
+                    ) : displayRequiredFields ? (
+                        <div className={kcClsx("kcContentWrapperClass")}>
+                            <div className={clsx(kcClsx("kcLabelWrapperClass"), "subtitle")}>
+                                <span className="subtitle">
+                                    <span className="required">*</span> {msg("requiredFields")}
+                                </span>
+                            </div>
+                            <div className="col-md-10">
+                                {showUsernameNode}
+                                <div id="kc-username" className={kcClsx("kcFormGroupClass")}>
+                                    <label id="kc-attempted-username">{auth.attemptedUsername}</label>
+                                    <a id="reset-login" href={url.loginRestartFlowUrl} aria-label={msgStr("restartLoginTooltip")}>
+                                        <div className="kc-login-tooltip">
+                                            <i className={kcClsx("kcResetFlowIcon")}></i>
+                                            <span className="kc-tooltip-text">{msg("restartLoginTooltip")}</span>
+                                        </div>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                    ) : (
+                        <>
+                            {showUsernameNode}
                            <div id="kc-username" className={kcClsx("kcFormGroupClass")}>
                                <label id="kc-attempted-username">{auth.attemptedUsername}</label>
                                <a id="reset-login" href={url.loginRestartFlowUrl} aria-label={msgStr("restartLoginTooltip")}>
@ -176,24 +212,8 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
                                    </div>
                                </a>
                            </div>
-                        );
-
-                        if (displayRequiredFields) {
-                            return (
-                                <div className={kcClsx("kcContentWrapperClass")}>
-                                    <div className={clsx(kcClsx("kcLabelWrapperClass"), "subtitle")}>
-                                        <span className="subtitle">
-                                            <span className="required">*</span>
-                                            {msg("requiredFields")}
-                                        </span>
-                                    </div>
-                                    <div className="col-md-10">{node}</div>
-                                </div>
-                            );
-                        }
-
-                        return node;
-                    })()}
+                        </>
+                    )}
                </header>
                <div id="kc-content">
                    <div id="kc-content-wrapper">
@ -224,17 +244,19 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
                        {auth !== undefined && auth.showTryAnotherWayLink && (
                            <form id="kc-select-try-another-way-form" action={url.loginAction} method="post">
                                <div className={kcClsx("kcFormGroupClass")}>
-                                    <input type="hidden" name="tryAnotherWay" value="on" />
-                                    <a
-                                        href="#"
-                                        id="try-another-way"
-                                        onClick={() => {
-                                            document.forms["kc-select-try-another-way-form" as never].submit();
-                                            return false;
-                                        }}
-                                    >
-                                        {msg("doTryAnotherWay")}
-                                    </a>
+                                    <div className={kcClsx("kcFormGroupClass")}>
+                                        <input type="hidden" name="tryAnotherWay" value="on" />
+                                        <a
+                                            href="#"
+                                            id="try-another-way"
+                                            onClick={() => {
+                                                document.forms["kc-select-try-another-way-form" as never].submit();
+                                                return false;
+                                            }}
+                                        >
+                                            {msg("doTryAnotherWay")}
+                                        </a>
+                                    </div>
                                </div>
                            </form>
                        )}
--- a/src/login/TemplateProps.ts
+++ b/src/login/TemplateProps.ts
@ -12,6 +12,7 @@ export type TemplateProps<KcContext, I18n> = {
    displayRequiredFields?: boolean;
    showAnotherWayIfPresent?: boolean;
    headerNode: ReactNode;
+    showUsernameNode?: ReactNode;
    socialProvidersNode?: ReactNode;
    infoNode?: ReactNode;
    documentTitle?: string;
--- a/src/login/UserProfileFormFields.tsx
+++ b/src/login/UserProfileFormFields.tsx
@ -1,5 +1,5 @@
 import { useEffect, useReducer, Fragment } from "react";
-import { assert } from "keycloakify/tools/assert";
+import { assert } from "tsafe/assert";
 import type { KcClsx } from "keycloakify/login/lib/kcClsx";
 import {
    useUserProfileForm,
@ -58,7 +58,7 @@ export default function UserProfileFormFields(props: UserProfileFormFieldsProps<
                                <label htmlFor={attribute.name} className={kcClsx("kcLabelClass")}>
                                    {advancedMsg(attribute.displayName ?? "")}
                                </label>
-                                {attribute.required && <> *</>}
+                                {attribute.required && <>*</>}
                            </div>
                            <div className={kcClsx("kcInputWrapperClass")}>
                                {attribute.annotations.inputHelperTextBefore !== undefined && (
@ -70,7 +70,7 @@ export default function UserProfileFormFields(props: UserProfileFormFieldsProps<
                                        {advancedMsg(attribute.annotations.inputHelperTextBefore)}
                                    </div>
                                )}
-                                <InputFieldByType
+                                <InputFiledByType
                                    attribute={attribute}
                                    valueOrValues={valueOrValues}
                                    displayableErrors={displayableErrors}
@ -188,7 +188,7 @@ function FieldErrors(props: { attribute: Attribute; displayableErrors: FormField
                .filter(error => error.fieldIndex === fieldIndex)
                .map(({ errorMessage }, i, arr) => (
                    <Fragment key={i}>
-                        {errorMessage}
+                        <span key={i}>{errorMessage}</span>
                        {arr.length - 1 !== i && <br />}
                    </Fragment>
                ))}
@ -196,7 +196,7 @@ function FieldErrors(props: { attribute: Attribute; displayableErrors: FormField
    );
 }

-type InputFieldByTypeProps = {
+type InputFiledByTypeProps = {
    attribute: Attribute;
    valueOrValues: string | string[];
    displayableErrors: FormFieldError[];
@ -205,7 +205,7 @@ type InputFieldByTypeProps = {
    kcClsx: KcClsx;
 };

-function InputFieldByType(props: InputFieldByTypeProps) {
+function InputFiledByType(props: InputFiledByTypeProps) {
    const { attribute, valueOrValues } = props;

    switch (attribute.annotations.inputType) {
@ -274,11 +274,9 @@ function PasswordWrapper(props: { kcClsx: KcClsx; i18n: I18n; passwordInputId: s
    );
 }

-function InputTag(props: InputFieldByTypeProps & { fieldIndex: number | undefined }) {
+function InputTag(props: InputFiledByTypeProps & { fieldIndex: number | undefined }) {
    const { attribute, fieldIndex, kcClsx, dispatchFormAction, valueOrValues, i18n, displayableErrors } = props;

-    const { advancedMsgStr } = i18n;
-
    return (
        <>
            <input
@ -307,9 +305,7 @@ function InputTag(props: InputFieldByTypeProps & { fieldIndex: number | undefine
                aria-invalid={displayableErrors.find(error => error.fieldIndex === fieldIndex) !== undefined}
                disabled={attribute.readOnly}
                autoComplete={attribute.autocomplete}
-                placeholder={
-                    attribute.annotations.inputTypePlaceholder === undefined ? undefined : advancedMsgStr(attribute.annotations.inputTypePlaceholder)
-                }
+                placeholder={attribute.annotations.inputTypePlaceholder}
                pattern={attribute.annotations.inputTypePattern}
                size={attribute.annotations.inputTypeSize === undefined ? undefined : parseInt(`${attribute.annotations.inputTypeSize}`)}
                maxLength={
@ -433,7 +429,7 @@ function AddRemoveButtonsMultiValuedAttribute(props: {
    );
 }

-function InputTagSelects(props: InputFieldByTypeProps) {
+function InputTagSelects(props: InputFiledByTypeProps) {
    const { attribute, dispatchFormAction, kcClsx, valueOrValues } = props;

    const { advancedMsg } = props.i18n;
@ -541,7 +537,7 @@ function InputTagSelects(props: InputFieldByTypeProps) {
    );
 }

-function TextareaTag(props: InputFieldByTypeProps) {
+function TextareaTag(props: InputFiledByTypeProps) {
    const { attribute, dispatchFormAction, kcClsx, displayableErrors, valueOrValues } = props;

    assert(typeof valueOrValues === "string");
@ -577,10 +573,10 @@ function TextareaTag(props: InputFieldByTypeProps) {
    );
 }

-function SelectTag(props: InputFieldByTypeProps) {
+function SelectTag(props: InputFiledByTypeProps) {
    const { attribute, dispatchFormAction, kcClsx, displayableErrors, i18n, valueOrValues } = props;

-    const { advancedMsgStr } = i18n;
+    const { advancedMsg } = i18n;

    const isMultiple = attribute.annotations.inputType === "multiselect";

@ -649,11 +645,11 @@ function SelectTag(props: InputFieldByTypeProps) {
                            if (attribute.annotations.inputOptionLabels !== undefined) {
                                const { inputOptionLabels } = attribute.annotations;

-                                return advancedMsgStr(inputOptionLabels[option] ?? option);
+                                return advancedMsg(inputOptionLabels[option] ?? option);
                            }

                            if (attribute.annotations.inputOptionLabelsI18nPrefix !== undefined) {
-                                return advancedMsgStr(`${attribute.annotations.inputOptionLabelsI18nPrefix}.${option}`);
+                                return advancedMsg(`${attribute.annotations.inputOptionLabelsI18nPrefix}.${option}`);
                            }

                            return option;
--- a/src/login/i18n/GenericI18n.tsx
+++ b/src/login/i18n/GenericI18n.tsx
@ -1,6 +0,0 @@
-import type { GenericI18n_noJsx } from "./i18n";
-
-export type GenericI18n<MessageKey extends string> = GenericI18n_noJsx<MessageKey> & {
-    msg: (key: MessageKey, ...args: (string | undefined)[]) => JSX.Element;
-    advancedMsg: (key: string, ...args: (string | undefined)[]) => JSX.Element;
-};
--- a/src/login/i18n/i18n.tsx
+++ b/src/login/i18n/i18n.tsx
@ -1,10 +1,9 @@
 import "keycloakify/tools/Object.fromEntries";
 import { assert } from "tsafe/assert";
-import messages_defaultSet_fallbackLanguage from "./messages_defaultSet/en";
-import { fetchMessages_defaultSet } from "./messages_defaultSet";
+import messages_fallbackLanguage from "./baseMessages/en";
+import { getMessages } from "./baseMessages";
 import type { KcContext } from "../KcContext";
-import { FALLBACK_LANGUAGE_TAG } from "keycloakify/bin/shared/constants";
-import { id } from "tsafe/id";
+import { fallbackLanguageTag } from "keycloakify/bin/shared/constants";

 export type KcContextLike = {
    locale?: {
@ -12,13 +11,16 @@ export type KcContextLike = {
        supported: { languageTag: string; url: string; label: string }[];
    };
    "x-keycloakify": {
-        messages: Record<string, string>;
+        realmMessageBundleUserProfile: Record<string, string> | undefined;
+        realmMessageBundleTermsText: string | undefined;
    };
 };

 assert<KcContext extends KcContextLike ? true : false>();

-export type GenericI18n_noJsx<MessageKey extends string> = {
+export type MessageKey = keyof typeof messages_fallbackLanguage;
+
+export type GenericI18n<MessageKey extends string> = {
    /**
     * e.g: "en", "fr", "zh-CN"
     *
@ -38,21 +40,16 @@ export type GenericI18n_noJsx<MessageKey extends string> = {
     * */
    labelBySupportedLanguageTag: Record<string, string>;
    /**
-     *
     * Examples assuming currentLanguageTag === "en"
-     * {
-     *   en: {
-     *     "access-denied": "Access denied",
-     *     "impersonateTitleHtml": "<strong>{0}</strong> Impersonate User",
-     *     "bar": "Bar {0}"
-     *   }
-     * }
     *
-     * msgStr("access-denied") === "Access denied"
-     * msgStr("not-a-message-key") Throws an error
+     * msg("access-denied") === <span>Access denied</span>
+     * msg("impersonateTitleHtml", "Foo") === <span><strong>Foo</strong> Impersonate User</span>
+     */
+    msg: (key: MessageKey, ...args: (string | undefined)[]) => JSX.Element;
+    /**
+     * It's the same thing as msg() but instead of returning a JSX.Element it returns a string.
+     * It can be more convenient to manipulate strings but if there are HTML tags it wont render.
     * msgStr("impersonateTitleHtml", "Foo") === "<strong>Foo</strong> Impersonate User"
-     * msgStr("${bar}", "<strong>c</strong>") === "Bar &lt;strong&gt;XXX&lt;/strong&gt;"
-     *  The html in the arg is partially escaped for security reasons, it might come from an untrusted source, it's not safe to render it as html.
     */
    msgStr: (key: MessageKey, ...args: (string | undefined)[]) => string;
    /**
@ -63,11 +60,24 @@ export type GenericI18n_noJsx<MessageKey extends string> = {
     * {
     *   en: {
     *     "access-denied": "Access denied",
+     *     "foo": "Foo {0} {1}",
+     *     "bar": "Bar {0}"
     *   }
     * }
     *
-     * advancedMsgStr("${access-denied}") === advancedMsgStr("access-denied") === msgStr("access-denied") === "Access denied"
-     * advancedMsgStr("${not-a-message-key}") === advancedMsgStr("not-a-message-key") === "not-a-message-key"
+     * advancedMsg("${access-denied} foo bar") === <span>{msgStr("access-denied")} foo bar<span> === <span>Access denied foo bar</span>
+     * advancedMsg("${access-denied}") === advancedMsg("access-denied") === msg("access-denied") === <span>Access denied</span>
+     * advancedMsg("${not-a-message-key}") === advancedMsg(not-a-message-key") === <span>not-a-message-key</span>
+     * advancedMsg("${bar}", "<strong>c</strong>")
+     *    === <span>{msgStr("bar", "<strong>XXX</strong>")}<span>
+     *    === <span>Bar &lt;strong&gt;XXX&lt;/strong&gt;</span> (The html in the arg is partially escaped for security reasons, it might be untrusted)
+     * advancedMsg("${foo} xx ${bar}", "a", "b", "c")
+     *    === <span>{msgStr("foo", "a", "b")} xx {msgStr("bar")}<span>
+     *    === <span>Foo a b xx Bar {0}</span> (The substitution are only applied in the first message)
+     */
+    advancedMsg: (key: string, ...args: (string | undefined)[]) => JSX.Element;
+    /**
+     * See advancedMsg() but instead of returning a JSX.Element it returns a string.
     */
    advancedMsgStr: (key: string, ...args: (string | undefined)[]) => string;

@ -79,12 +89,10 @@ export type GenericI18n_noJsx<MessageKey extends string> = {
    isFetchingTranslations: boolean;
 };

-export type MessageKey_defaultSet = keyof typeof messages_defaultSet_fallbackLanguage;
-
-export function createGetI18n<MessageKey_themeDefined extends string = never>(messagesByLanguageTag_themeDefined: {
-    [languageTag: string]: { [key in MessageKey_themeDefined]: string };
+export function createGetI18n<ExtraMessageKey extends string = never>(messageBundle: {
+    [languageTag: string]: { [key in ExtraMessageKey]: string };
 }) {
-    type I18n = GenericI18n_noJsx<MessageKey_defaultSet | MessageKey_themeDefined>;
+    type I18n = GenericI18n<MessageKey | ExtraMessageKey>;

    type Result = { i18n: I18n; prI18n_currentLanguage: Promise<I18n> | undefined };

@ -104,7 +112,7 @@ export function createGetI18n<MessageKey_themeDefined extends string = never>(me
        }

        const partialI18n: Pick<I18n, "currentLanguageTag" | "getChangeLocaleUrl" | "labelBySupportedLanguageTag"> = {
-            currentLanguageTag: kcContext.locale?.currentLanguageTag ?? FALLBACK_LANGUAGE_TAG,
+            currentLanguageTag: kcContext.locale?.currentLanguageTag ?? fallbackLanguageTag,
            getChangeLocaleUrl: newLanguageTag => {
                const { locale } = kcContext;

@ -119,38 +127,32 @@ export function createGetI18n<MessageKey_themeDefined extends string = never>(me
            labelBySupportedLanguageTag: Object.fromEntries((kcContext.locale?.supported ?? []).map(({ languageTag, label }) => [languageTag, label]))
        };

-        const { createI18nTranslationFunctions } = createI18nTranslationFunctionsFactory<MessageKey_themeDefined>({
-            messages_themeDefined:
-                messagesByLanguageTag_themeDefined[partialI18n.currentLanguageTag] ??
-                messagesByLanguageTag_themeDefined[FALLBACK_LANGUAGE_TAG] ??
-                (() => {
-                    const firstLanguageTag = Object.keys(messagesByLanguageTag_themeDefined)[0];
-                    if (firstLanguageTag === undefined) {
-                        return undefined;
-                    }
-                    return messagesByLanguageTag_themeDefined[firstLanguageTag];
-                })(),
-            messages_fromKcServer: kcContext["x-keycloakify"].messages
+        const { createI18nTranslationFunctions } = createI18nTranslationFunctionsFactory<MessageKey, ExtraMessageKey>({
+            messages_fallbackLanguage,
+            messageBundle_fallbackLanguage: messageBundle[fallbackLanguageTag],
+            messageBundle_currentLanguage: messageBundle[partialI18n.currentLanguageTag],
+            realmMessageBundleUserProfile: kcContext["x-keycloakify"].realmMessageBundleUserProfile,
+            realmMessageBundleTermsText: kcContext["x-keycloakify"].realmMessageBundleTermsText
        });

-        const isCurrentLanguageFallbackLanguage = partialI18n.currentLanguageTag === FALLBACK_LANGUAGE_TAG;
+        const isCurrentLanguageFallbackLanguage = partialI18n.currentLanguageTag === fallbackLanguageTag;

        const result: Result = {
            i18n: {
                ...partialI18n,
                ...createI18nTranslationFunctions({
-                    messages_defaultSet_currentLanguage: isCurrentLanguageFallbackLanguage ? messages_defaultSet_fallbackLanguage : undefined
+                    messages_currentLanguage: isCurrentLanguageFallbackLanguage ? messages_fallbackLanguage : undefined
                }),
                isFetchingTranslations: !isCurrentLanguageFallbackLanguage
            },
            prI18n_currentLanguage: isCurrentLanguageFallbackLanguage
                ? undefined
                : (async () => {
-                      const messages_defaultSet_currentLanguage = await fetchMessages_defaultSet(partialI18n.currentLanguageTag);
+                      const messages_currentLanguage = await getMessages(partialI18n.currentLanguageTag);

                      const i18n_currentLanguage: I18n = {
                          ...partialI18n,
-                          ...createI18nTranslationFunctions({ messages_defaultSet_currentLanguage }),
+                          ...createI18nTranslationFunctions({ messages_currentLanguage }),
                          isFetchingTranslations: false
                      };

@ -173,78 +175,143 @@ export function createGetI18n<MessageKey_themeDefined extends string = never>(me
    return { getI18n };
 }

-function createI18nTranslationFunctionsFactory<MessageKey_themeDefined extends string>(params: {
-    messages_themeDefined: Record<MessageKey_themeDefined, string> | undefined;
-    messages_fromKcServer: Record<string, string>;
+function createI18nTranslationFunctionsFactory<MessageKey extends string, ExtraMessageKey extends string>(params: {
+    messages_fallbackLanguage: Record<MessageKey, string>;
+    messageBundle_fallbackLanguage: Record<ExtraMessageKey, string> | undefined;
+    messageBundle_currentLanguage: Partial<Record<ExtraMessageKey, string>> | undefined;
+    realmMessageBundleUserProfile: Record<string, string> | undefined;
+    realmMessageBundleTermsText: string | undefined;
 }) {
-    const { messages_themeDefined, messages_fromKcServer } = params;
+    const { messageBundle_currentLanguage, realmMessageBundleUserProfile, realmMessageBundleTermsText } = params;
+
+    const messages_fallbackLanguage = {
+        ...params.messages_fallbackLanguage,
+        ...params.messageBundle_fallbackLanguage
+    };

    function createI18nTranslationFunctions(params: {
-        messages_defaultSet_currentLanguage: Partial<Record<MessageKey_defaultSet, string>> | undefined;
-    }): Pick<GenericI18n_noJsx<MessageKey_defaultSet | MessageKey_themeDefined>, "msgStr" | "advancedMsgStr"> {
-        const { messages_defaultSet_currentLanguage } = params;
+        messages_currentLanguage: Partial<Record<MessageKey, string>> | undefined;
+    }): Pick<GenericI18n<MessageKey | ExtraMessageKey>, "msg" | "msgStr" | "advancedMsg" | "advancedMsgStr"> {
+        const messages_currentLanguage = {
+            ...params.messages_currentLanguage,
+            ...messageBundle_currentLanguage
+        };

-        function resolveMsg(props: { key: string; args: (string | undefined)[] }): string | undefined {
-            const { key, args } = props;
+        function resolveMsg(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): string | JSX.Element | undefined {
+            const { key, args, doRenderAsHtml } = props;

-            const message =
-                id<Record<string, string | undefined>>(messages_fromKcServer)[key] ??
-                id<Record<string, string | undefined> | undefined>(messages_themeDefined)?.[key] ??
-                id<Record<string, string | undefined> | undefined>(messages_defaultSet_currentLanguage)?.[key] ??
-                id<Record<string, string | undefined>>(messages_defaultSet_fallbackLanguage)[key];
+            const messageOrUndefined: string | undefined = (() => {
+                const messageOrUndefined = (messages_currentLanguage as any)[key] ?? (messages_fallbackLanguage as any)[key];

-            if (message === undefined) {
+                if (key === "termsText" && realmMessageBundleTermsText !== undefined) {
+                    return realmMessageBundleTermsText;
+                }
+
+                return messageOrUndefined;
+            })();
+
+            if (messageOrUndefined === undefined) {
                return undefined;
            }

-            const startIndex = message
-                .match(/{[0-9]+}/g)
-                ?.map(g => g.match(/{([0-9]+)}/)![1])
-                .map(indexStr => parseInt(indexStr))
-                .sort((a, b) => a - b)[0];
+            const message = messageOrUndefined;

-            if (startIndex === undefined) {
-                // No {0} in message (no arguments expected)
-                return message;
-            }
+            const messageWithArgsInjectedIfAny = (() => {
+                const startIndex = message
+                    .match(/{[0-9]+}/g)
+                    ?.map(g => g.match(/{([0-9]+)}/)![1])
+                    .map(indexStr => parseInt(indexStr))
+                    .sort((a, b) => a - b)[0];

-            let messageWithArgsInjected = message;
-
-            args.forEach((arg, i) => {
-                if (arg === undefined) {
-                    return;
+                if (startIndex === undefined) {
+                    // No {0} in message (no arguments expected)
+                    return message;
                }

-                messageWithArgsInjected = messageWithArgsInjected.replace(
-                    new RegExp(`\\{${i + startIndex}\\}`, "g"),
-                    (() => {
-                        if (key === "loginTitleHtml") {
-                            return arg;
-                        }
+                let messageWithArgsInjected = message;

-                        return arg.replace(/</g, "&lt;").replace(/>/g, "&gt;");
-                    })()
-                );
-            });
+                args.forEach((arg, i) => {
+                    if (arg === undefined) {
+                        return;
+                    }

-            return messageWithArgsInjected;
+                    messageWithArgsInjected = messageWithArgsInjected.replace(
+                        new RegExp(`\\{${i + startIndex}\\}`, "g"),
+                        arg.replace(/</g, "&lt;").replace(/>/g, "&gt;")
+                    );
+                });
+
+                return messageWithArgsInjected;
+            })();
+
+            return doRenderAsHtml ? (
+                <span
+                    // NOTE: The message is trusted. The arguments are not but are escaped.
+                    dangerouslySetInnerHTML={{
+                        __html: messageWithArgsInjectedIfAny
+                    }}
+                />
+            ) : (
+                messageWithArgsInjectedIfAny
+            );
        }

-        function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[] }): string {
-            const { key, args } = props;
+        function resolveMsgAdvanced(props: { key: string; args: (string | undefined)[]; doRenderAsHtml: boolean }): JSX.Element | string {
+            const { key, args, doRenderAsHtml } = props;

-            const match = key.match(/^\$\{(.+)\}$/);
+            if (realmMessageBundleUserProfile !== undefined && key in realmMessageBundleUserProfile) {
+                const resolvedMessage = realmMessageBundleUserProfile[key];

-            return resolveMsg({ key: match !== null ? match[1] : key, args }) ?? key;
+                return doRenderAsHtml ? (
+                    <span
+                        // NOTE: The message is trusted. The arguments are not but are escaped.
+                        dangerouslySetInnerHTML={{
+                            __html: resolvedMessage
+                        }}
+                    />
+                ) : (
+                    resolvedMessage
+                );
+            }
+
+            if (!/\$\{[^}]+\}/.test(key)) {
+                const resolvedMessage = resolveMsg({ key, args, doRenderAsHtml });
+
+                if (resolvedMessage === undefined) {
+                    return doRenderAsHtml ? <span dangerouslySetInnerHTML={{ __html: key }} /> : key;
+                }
+
+                return resolvedMessage;
+            }
+
+            let isFirstMatch = true;
+
+            const resolvedComplexMessage = key.replace(/\$\{([^}]+)\}/g, (...[, key_i]) => {
+                const replaceBy = resolveMsg({ key: key_i, args: isFirstMatch ? args : [], doRenderAsHtml: false }) ?? key_i;
+
+                isFirstMatch = false;
+
+                return replaceBy;
+            });
+
+            return doRenderAsHtml ? <span dangerouslySetInnerHTML={{ __html: resolvedComplexMessage }} /> : resolvedComplexMessage;
        }

        return {
-            msgStr: (key, ...args) => {
-                const resolvedMessage = resolveMsg({ key, args });
-                assert(resolvedMessage !== undefined, `Message with key "${key}" not found`);
-                return resolvedMessage;
-            },
-            advancedMsgStr: (key, ...args) => resolveMsgAdvanced({ key, args })
+            msgStr: (key, ...args) => resolveMsg({ key, args, doRenderAsHtml: false }) as string,
+            msg: (key, ...args) => resolveMsg({ key, args, doRenderAsHtml: true }) as JSX.Element,
+            advancedMsg: (key, ...args) =>
+                resolveMsgAdvanced({
+                    key,
+                    args,
+                    doRenderAsHtml: true
+                }) as JSX.Element,
+            advancedMsgStr: (key, ...args) =>
+                resolveMsgAdvanced({
+                    key,
+                    args,
+                    doRenderAsHtml: false
+                }) as string
        };
    }

--- a/src/login/i18n/index.ts
+++ b/src/login/i18n/index.ts
@ -1,5 +1,4 @@
-import type { GenericI18n } from "./GenericI18n";
-import type { MessageKey_defaultSet, KcContextLike } from "./i18n";
-export type { MessageKey_defaultSet, KcContextLike };
-export type I18n = GenericI18n<MessageKey_defaultSet>;
+import type { GenericI18n, MessageKey, KcContextLike } from "./i18n";
+export type { MessageKey, KcContextLike };
+export type I18n = GenericI18n<MessageKey>;
 export { createUseI18n } from "./useI18n";
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Joseph Garrone	0aca4cc449	Release debug build	2024-06-23 02:09:03 +02:00
Joseph Garrone	777d8690c2	Debug commit TO DELETE	2024-06-23 02:08:33 +02:00
				`@ -0,0 +1 @@`
				`export * from "./downloadAndExtractArchive";`