Bump version

Fix allegated vulnerability
Use tag v8 when releasing from this branch
2024-09-30 11:40:19 +02:00 · 2024-09-30 11:40:07 +02:00 · 2024-08-16 08:40:27 +02:00 · 2024-08-13 14:32:09 +02:00 · 2024-08-13 14:31:52 +02:00 · 2024-02-27 23:18:33 +01:00
58 changed files with 1136 additions and 970 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -186,60 +186,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "xgp",
-      "name": "Garth",
-      "avatar_url": "https://avatars.githubusercontent.com/u/244253?v=4",
-      "profile": "https://github.com/xgp",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "BlackVoid",
-      "name": "Felix Gustavsson",
-      "avatar_url": "https://avatars.githubusercontent.com/u/673720?v=4",
-      "profile": "https://github.com/BlackVoid",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "msiemens",
-      "name": "Markus Siemens",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1873922?v=4",
-      "profile": "https://m-siemens.de/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "law108000",
-      "name": "Rlok",
-      "avatar_url": "https://avatars.githubusercontent.com/u/8112024?v=4",
-      "profile": "https://github.com/law108000",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Moulyy",
-      "name": "Moulyy",
-      "avatar_url": "https://avatars.githubusercontent.com/u/115405804?v=4",
-      "profile": "https://github.com/Moulyy",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "giorgoslytos",
-      "name": "giorgoslytos",
-      "avatar_url": "https://avatars.githubusercontent.com/u/50946162?v=4",
-      "profile": "https://github.com/giorgoslytos",
-      "contributions": [
-        "code"
-      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@ -3,9 +3,7 @@ on:
  push:
    branches:
      - main
-      - v5
-      - v6
-      - v7
+      - v8
  pull_request:
    branches:
      - main
@ -132,10 +130,7 @@ jobs:
          echo "Can't publish on NPM, You must first create a secret called NPM_TOKEN that contains your NPM auth token. https://help.github.com/en/actions/automating-your-workflow-with-github-actions/creating-and-using-encrypted-secrets"
          false
        fi
-        EXTRA_ARGS=""
-        if [ "$IS_PRE_RELEASE" = "true" ]; then
-            EXTRA_ARGS="--tag next"
-        fi
+        EXTRA_ARGS="--tag v8"
        npm publish $EXTRA_ARGS
      env:
        NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
--- a/README.md
+++ b/README.md
@ -36,12 +36,24 @@

 <p align="center">
    <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/keycloakify/keycloakify/assets/6702424/e66d105c-c06f-47d1-8a31-a6ab09da4e80">
+    <img src="https://user-images.githubusercontent.com/6702424/110260457-a1c3d380-7fac-11eb-853a-80459b65626b.png">
 </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** [and up](https://github.com/keycloakify/keycloakify/discussions/346#discussioncomment-5889791)!
+> Whether or not React is your preferred framework, Keycloakify
+> offers a solid option for building Keycloak themes.
+> It's not just a convenient way to create a Keycloak theme
+> when using React; it's a well-regarded solution that many
+> developers appreciate.
+
+> 📣 🛑 Account themes generated by Keycloakify are not currently compatible with Keycloak 22.  
+> We are working on a solution. [Follow progress](https://github.com/keycloakify/keycloakify/issues/389).  
+> **Login and email themes are not affected**.  
+> UPDATE: [The PR](https://github.com/keycloak/keycloak/pull/22317) that should future proof Keycloakify account themes has been
+> merged into Keycloak! 🥳 Credit to @xgp. We are now waiting for a new Keycloak release to be published.
+
+Keycloakify is fully compatible with Keycloak, starting from version 11 and is anticipated to maintain compatibility with all future versions.  
+You can update your Keycloak, your Keycloakify generated theme won't break. (Well except for Keycloak 22's Account theme obviously but this was hopefully a one time debacle)  
+To understand the basis of my confidence in this, you can [visit this discussion thread where I've explained in detail](https://github.com/keycloakify/keycloakify/discussions/346#discussioncomment-5889791).

 ## Sponsor 👼

@ -107,14 +119,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zavoloklom"><img src="https://avatars.githubusercontent.com/u/4151869?v=4?s=100" width="100px;" alt="Sergey Kupletsky"/><br /><sub><b>Sergey Kupletsky</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=zavoloklom" title="Tests">⚠️</a> <a href="https://github.com/keycloakify/keycloakify/commits?author=zavoloklom" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rome-user"><img src="https://avatars.githubusercontent.com/u/114131048?v=4?s=100" width="100px;" alt="rome-user"/><br /><sub><b>rome-user</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=rome-user" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/celinepelletier"><img src="https://avatars.githubusercontent.com/u/82821620?v=4?s=100" width="100px;" alt="Céline Pelletier"/><br /><sub><b>Céline Pelletier</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=celinepelletier" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xgp"><img src="https://avatars.githubusercontent.com/u/244253?v=4?s=100" width="100px;" alt="Garth"/><br /><sub><b>Garth</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=xgp" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BlackVoid"><img src="https://avatars.githubusercontent.com/u/673720?v=4?s=100" width="100px;" alt="Felix Gustavsson"/><br /><sub><b>Felix Gustavsson</b></sub></a><br /><a href="https://github.com/keycloakify/keycloakify/commits?author=BlackVoid" title="Code">💻</a></td>
-      <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/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>
@ -126,14 +130,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d

 # Changelog highlights

-## 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.  
@ -142,7 +138,58 @@ Very few. Check them out [here](https://docs.keycloakify.dev/migration-guides/v8

 ### 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).
+There are very few breaking changes in this major version.
+
+-   The [`--external-assets` build option has been removed](https://docs.keycloakify.dev/v/v7/build-options#external-assets-deprecated) it was a performance optimization that is no longer relevant now that
+    we have lazy loading.
+
+-   `kcContext.usernameEditDisabled` is now `kcContext.usernameHidden`, the type was lying, it has been updated to reflect what's actually on the `kcContext` at runtime.
+    If you want to see in detail what should be updated [see issue](https://github.com/keycloakify/keycloakify/pull/399), or you can search and replace `usernameEditDisabled` -> `usernameHidden` it'll do the trick.
+
+-   The `usePrepareTemplate` prototype has been changed, you can search and replace:
+
+`src/keycloak-theme/login/Template.tsx`
+
+```ts
+url,
+"stylesCommon": [
+    "node_modules/patternfly/dist/css/patternfly.min.css",
+    "node_modules/patternfly/dist/css/patternfly-additions.min.css",
+    "lib/zocial/zocial.css"
+],
+"styles": ["css/login.css"],
+```
+
+by
+
+```ts
+"styles": [
+    `${url.resourcesCommonPath}/node_modules/patternfly/dist/css/patternfly.min.css`,
+    `${url.resourcesCommonPath}/node_modules/patternfly/dist/css/patternfly-additions.min.css`,
+    `${url.resourcesCommonPath}/lib/zocial/zocial.css`,
+    `${url.resourcesPath}/css/login.css`
+],
+```
+
+and
+
+`src/keycloak-theme/account/Template.css`
+
+```ts
+url,
+"stylesCommon": ["node_modules/patternfly/dist/css/patternfly.min.css", "node_modules/patternfly/dist/css/patternfly-additions.min.css"],
+"styles": ["css/account.css"],
+```
+
+by
+
+```ts
+"styles": [
+    `${url.resourcesCommonPath}/node_modules/patternfly/dist/css/patternfly.min.css`,
+    `${url.resourcesCommonPath}/node_modules/patternfly/dist/css/patternfly-additions.min.css`,
+    `${url.resourcesPath}/css/account.css`
+],
+```

 ## 7.15

@ -164,7 +211,7 @@ There are very few breaking changes in this major version. [Check them out](http
 ## 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).
+    There is now an idiomatic way of achieving the same result. [Learn more](https://docs.keycloakify.dev/build-options#keycloakify.extrathemenames).

 ## 7.9

@ -259,79 +306,79 @@ Checkout [the migration guide](https://docs.keycloakify.dev/v5-to-v6)

 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
+## v5.6.0

 Add support for `login-config-totp.ftl` page [#127](https://github.com/keycloakify/keycloakify/pull/127).

-## 5.3.0
+## v5.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
+## v5.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
+## v4.10.0

 Add `login-idp-link-email.ftl` page [See PR](https://github.com/keycloakify/keycloakify/pull/92).

-## 4.8.0
+## v4.8.0

 [Email template customization.](#email-template-customization)

-## 4.7.4
+## v4.7.4

 **M1 Mac** support (for testing locally with a dockerized Keycloak).

-## 4.7.2
+## v4.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
+## v4.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
+## v4.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
+## v4.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
+## v4.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
+## v4

 -   Out of the box [frontend form validation](#user-profile-and-frontend-form-validation) 🥳
 -   Improvements (and breaking changes in `import { useKcMessage } from "keycloakify"`.

-## 3
+## v3

 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
+## v2.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
+## v2

 -   It's now possible to implement custom `.ftl` pages.
 -   Support for Keycloak plugins that introduce non standard ftl values.
--- a/keycloakify-json-schema.json
+++ b/keycloakify-json-schema.json
@ -0,0 +1,73 @@
+{
+    "allOf": [
+        {
+            "$ref": "https://json.schemastore.org/package.json"
+        },
+        {
+            "$ref": "keycloakifyPackageJsonSchema"
+        }
+    ],
+    "$ref": "#/definitions/keycloakifyPackageJsonSchema",
+    "definitions": {
+        "keycloakifyPackageJsonSchema": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "version": {
+                    "type": "string"
+                },
+                "homepage": {
+                    "type": "string"
+                },
+                "keycloakify": {
+                    "type": "object",
+                    "properties": {
+                        "extraPages": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "extraThemeProperties": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "areAppAndKeycloakServerSharingSameDomain": {
+                            "type": "boolean"
+                        },
+                        "artifactId": {
+                            "type": "string"
+                        },
+                        "groupId": {
+                            "type": "string"
+                        },
+                        "bundler": {
+                            "type": "string",
+                            "enum": ["mvn", "keycloakify", "none"]
+                        },
+                        "keycloakVersionDefaultAssets": {
+                            "type": "string"
+                        },
+                        "reactAppBuildDirPath": {
+                            "type": "string"
+                        },
+                        "keycloakifyBuildDirPath": {
+                            "type": "string"
+                        },
+                        "themeName": {
+                            "type": "string"
+                        }
+                    },
+                    "additionalProperties": false
+                }
+            },
+            "required": ["name", "version"],
+            "additionalProperties": false
+        }
+    },
+    "$schema": "http://json-schema.org/draft-07/schema#"
+}
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "keycloakify",
-    "version": "9.3.1",
+    "version": "8.4.5",
    "description": "Create Keycloak themes using React",
    "repository": {
        "type": "git",
@ -13,7 +13,7 @@
        "build": "rimraf dist/ && tsc -p src/bin && tsc -p src && tsc-alias -p src/tsconfig.json && yarn grant-exec-perms && yarn copy-files dist/ && cp -r src dist/",
        "generate:json-schema": "ts-node scripts/generate-json-schema.ts",
        "grant-exec-perms": "node dist/bin/tools/grant-exec-perms.js",
-        "copy-files": "copyfiles -u 1 src/**/*.ftl src/**/*.java",
+        "copy-files": "copyfiles -u 1 src/**/*.ftl",
        "test": "yarn test:types && vitest run",
        "test:keycloakify-starter": "ts-node scripts/test-keycloakify-starter",
        "test:types": "tsc -p test/tsconfig.json --noEmit",
@ -112,7 +112,7 @@
        "@babel/parser": "^7.22.7",
        "@babel/types": "^7.22.5",
        "@octokit/rest": "^18.12.0",
-        "cheerio": "^1.0.0-rc.5",
+        "cheerio": "1.0.0-rc.5",
        "cli-select": "^1.1.2",
        "evt": "^2.4.18",
        "make-fetch-happen": "^11.0.3",
--- a/scripts/generate-i18n-messages.ts
+++ b/scripts/generate-i18n-messages.ts
@ -17,18 +17,16 @@ const isSilent = true;
 const logger = getLogger({ isSilent });

 async function main() {
-    const keycloakVersion = "23.0.4";
+    const keycloakVersion = "21.0.1";

    const tmpDirPath = pathJoin(getProjectRoot(), "tmp_xImOef9dOd44");

    fs.rmSync(tmpDirPath, { "recursive": true, "force": true });

    await downloadBuiltinKeycloakTheme({
+        "projectDirPath": getProjectRoot(),
        keycloakVersion,
-        "destDirPath": tmpDirPath,
-        "buildOptions": {
-            "cacheDirPath": pathJoin(getProjectRoot(), "node_modules", ".cache", "keycloakify")
-        }
+        "destDirPath": tmpDirPath
    });

    type Dictionary = { [idiomId: string]: string };
--- a/src/account/kcContext/KcContext.ts
+++ b/src/account/kcContext/KcContext.ts
@ -1,7 +1,6 @@
-import type { AccountThemePageId } from "keycloakify/bin/keycloakify/generateFtl";
+import type { AccountThemePageId, ThemeType } from "keycloakify/bin/keycloakify/generateFtl";
 import { assert } from "tsafe/assert";
 import type { Equals } from "tsafe";
-import { type ThemeType } from "keycloakify/bin/constants";

 export type KcContext = KcContext.Password | KcContext.Account;

--- a/src/account/kcContext/createGetKcContext.ts
+++ b/src/account/kcContext/createGetKcContext.ts
@ -3,8 +3,9 @@ import { deepAssign } from "keycloakify/tools/deepAssign";
 import type { ExtendKcContext } from "./getKcContextFromWindow";
 import { getKcContextFromWindow } from "./getKcContextFromWindow";
 import { pathJoin } from "keycloakify/bin/tools/pathJoin";
+import { pathBasename } from "keycloakify/tools/pathBasename";
+import { resourcesCommonDirPathRelativeToPublicDir } from "keycloakify/bin/mockTestingResourcesPath";
 import { symToStr } from "tsafe/symToStr";
-import { resources_common } from "keycloakify/bin/constants";
 import { kcContextMocks, kcContextCommonMock } from "keycloakify/account/kcContext/kcContextMocks";

 export function createGetKcContext<KcContextExtension extends { pageId: string } = never>(params?: {
@ -88,7 +89,11 @@ export function createGetKcContext<KcContextExtension extends { pageId: string }
            return { "kcContext": undefined as any };
        }

-        realKcContext.url.resourcesCommonPath = pathJoin(realKcContext.url.resourcesPath, resources_common);
+        {
+            const { url } = realKcContext;
+
+            url.resourcesCommonPath = pathJoin(url.resourcesPath, pathBasename(resourcesCommonDirPathRelativeToPublicDir));
+        }

        return { "kcContext": realKcContext as any };
    }
--- a/src/account/kcContext/kcContextMocks.ts
+++ b/src/account/kcContext/kcContextMocks.ts
@ -1,21 +1,19 @@
 import "minimal-polyfills/Object.fromEntries";
-import { resources_common, keycloak_resources } from "keycloakify/bin/constants";
+import { resourcesCommonDirPathRelativeToPublicDir, resourcesDirPathRelativeToPublicDir } from "keycloakify/bin/mockTestingResourcesPath";
 import { pathJoin } from "keycloakify/bin/tools/pathJoin";
 import { id } from "tsafe/id";
 import type { KcContext } from "./KcContext";

 const PUBLIC_URL = (typeof process !== "object" ? undefined : process.env?.["PUBLIC_URL"]) || "/";

-const resourcesPath = pathJoin(PUBLIC_URL, keycloak_resources, "account", "resources");
-
 export const kcContextCommonMock: KcContext.Common = {
    "themeVersion": "0.0.0",
    "keycloakifyVersion": "0.0.0",
    "themeType": "account",
    "themeName": "my-theme-name",
    "url": {
-        resourcesPath,
-        "resourcesCommonPath": pathJoin(resourcesPath, resources_common),
+        "resourcesPath": pathJoin(PUBLIC_URL, resourcesDirPathRelativeToPublicDir),
+        "resourcesCommonPath": pathJoin(PUBLIC_URL, resourcesCommonDirPathRelativeToPublicDir),
        "resourceUrl": "#",
        "accountUrl": "#",
        "applicationsUrl": "#",
--- a/src/account/pages/PageProps.ts
+++ b/src/account/pages/PageProps.ts
@ -1,9 +1,9 @@
+import type { LazyExoticComponent } from "react";
 import type { I18n } from "keycloakify/account/i18n";
 import type { TemplateProps, ClassKey } from "keycloakify/account/TemplateProps";
-import type { LazyOrNot } from "keycloakify/tools/LazyOrNot";

 export type PageProps<KcContext, I18nExtended extends I18n> = {
-    Template: LazyOrNot<(props: TemplateProps<any, any>) => JSX.Element | null>;
+    Template: LazyExoticComponent<(props: TemplateProps<any, any>) => JSX.Element | null>;
    kcContext: KcContext;
    i18n: I18nExtended;
    doUseDefaultCss: boolean;
--- a/src/bin/constants.ts
+++ b/src/bin/constants.ts
@ -1,9 +0,0 @@
-export const keycloak_resources = "keycloak-resources";
-export const resources_common = "resources-common";
-export const lastKeycloakVersionWithAccountV1 = "21.1.2";
-
-export const themeTypes = ["login", "account"] as const;
-export const retrocompatPostfix = "_retrocompat";
-export const accountV1 = "account-v1";
-
-export type ThemeType = (typeof themeTypes)[number];
--- a/src/bin/copy-keycloak-resources-to-public.ts
+++ b/src/bin/copy-keycloak-resources-to-public.ts
@ -2,39 +2,38 @@

 import { downloadKeycloakStaticResources } from "./keycloakify/generateTheme/downloadKeycloakStaticResources";
 import { join as pathJoin, relative as pathRelative } from "path";
+import { basenameOfKeycloakDirInPublicDir } from "./mockTestingResourcesPath";
 import { readBuildOptions } from "./keycloakify/BuildOptions";
-import { themeTypes, keycloak_resources, lastKeycloakVersionWithAccountV1 } from "./constants";
+import { themeTypes } from "./keycloakify/generateFtl";
 import * as fs from "fs";

 (async () => {
-    const reactAppRootDirPath = process.cwd();
+    const projectDirPath = process.cwd();

    const buildOptions = readBuildOptions({
-        reactAppRootDirPath,
-        "processArgv": process.argv.slice(2)
+        "processArgv": process.argv.slice(2),
+        "projectDirPath": process.cwd()
    });

-    const reservedDirPath = pathJoin(buildOptions.publicDirPath, keycloak_resources);
+    const keycloakDirInPublicDir = pathJoin(process.env["PUBLIC_DIR_PATH"] || pathJoin(projectDirPath, "public"), basenameOfKeycloakDirInPublicDir);
+
+    if (fs.existsSync(keycloakDirInPublicDir)) {
+        console.log(`${pathRelative(projectDirPath, keycloakDirInPublicDir)} already exists.`);
+        return;
+    }

    for (const themeType of themeTypes) {
        await downloadKeycloakStaticResources({
-            "keycloakVersion": (() => {
-                switch (themeType) {
-                    case "login":
-                        return buildOptions.loginThemeResourcesFromKeycloakVersion;
-                    case "account":
-                        return lastKeycloakVersionWithAccountV1;
-                }
-            })(),
-            themeType,
-            "themeDirPath": reservedDirPath,
-            "usedResources": undefined,
-            buildOptions
+            projectDirPath,
+            "keycloakVersion": buildOptions.keycloakVersionDefaultAssets,
+            "themeType": themeType,
+            "themeDirPath": keycloakDirInPublicDir,
+            "usedResources": undefined
        });
    }

    fs.writeFileSync(
-        pathJoin(reservedDirPath, "README.txt"),
+        pathJoin(keycloakDirInPublicDir, "README.txt"),
        Buffer.from(
            // prettier-ignore
            [
@ -44,7 +43,7 @@ import * as fs from "fs";
        )
    );

-    fs.writeFileSync(pathJoin(buildOptions.publicDirPath, "keycloak-resources", ".gitignore"), Buffer.from("*", "utf8"));
+    fs.writeFileSync(pathJoin(keycloakDirInPublicDir, ".gitignore"), Buffer.from("*", "utf8"));

-    console.log(`${pathRelative(reactAppRootDirPath, reservedDirPath)} directory created.`);
+    console.log(`${pathRelative(projectDirPath, keycloakDirInPublicDir)} directory created.`);
 })();
--- a/src/bin/download-builtin-keycloak-theme.ts
+++ b/src/bin/download-builtin-keycloak-theme.ts
@ -4,74 +4,21 @@ import { downloadAndUnzip } from "./tools/downloadAndUnzip";
 import { promptKeycloakVersion } from "./promptKeycloakVersion";
 import { getLogger } from "./tools/logger";
 import { readBuildOptions } from "./keycloakify/BuildOptions";
-import { assert } from "tsafe/assert";
-import type { BuildOptions } from "./keycloakify/BuildOptions";
 import * as child_process from "child_process";
 import * as fs from "fs";

-export type BuildOptionsLike = {
-    cacheDirPath: string;
-};
-
-assert<BuildOptions extends BuildOptionsLike ? true : false>();
-
-export async function downloadBuiltinKeycloakTheme(params: { keycloakVersion: string; destDirPath: string; buildOptions: BuildOptionsLike }) {
-    const { keycloakVersion, destDirPath, buildOptions } = params;
+export async function downloadBuiltinKeycloakTheme(params: { projectDirPath: string; keycloakVersion: string; destDirPath: string }) {
+    const { projectDirPath, keycloakVersion, destDirPath } = params;

    await downloadAndUnzip({
        "doUseCache": true,
-        "cacheDirPath": buildOptions.cacheDirPath,
+        projectDirPath,
        destDirPath,
        "url": `https://github.com/keycloak/keycloak/archive/refs/tags/${keycloakVersion}.zip`,
        "specificDirsToExtract": ["", "-community"].map(ext => `keycloak-${keycloakVersion}/themes/src/main/resources${ext}/theme`),
        "preCacheTransform": {
            "actionCacheId": "npm install and build",
            "action": async ({ destDirPath }) => {
-                fix_account_css: {
-                    const accountCssFilePath = pathJoin(destDirPath, "keycloak", "account", "resources", "css", "account.css");
-
-                    if (!fs.existsSync(accountCssFilePath)) {
-                        break fix_account_css;
-                    }
-
-                    fs.writeFileSync(
-                        accountCssFilePath,
-                        Buffer.from(fs.readFileSync(accountCssFilePath).toString("utf8").replace("top: -34px;", "top: -34px !important;"), "utf8")
-                    );
-                }
-
-                fix_account_topt: {
-                    const totpFtlFilePath = pathJoin(destDirPath, "base", "account", "totp.ftl");
-
-                    if (!fs.existsSync(totpFtlFilePath)) {
-                        break fix_account_topt;
-                    }
-
-                    fs.writeFileSync(
-                        totpFtlFilePath,
-                        Buffer.from(
-                            fs
-                                .readFileSync(totpFtlFilePath)
-                                .toString("utf8")
-                                .replace(
-                                    [
-                                        "                <#list totp.policy.supportedApplications as app>",
-                                        "                    <li>${app}</li>",
-                                        "                </#list>"
-                                    ].join("\n"),
-                                    [
-                                        "                <#if totp.policy.supportedApplications?has_content>",
-                                        "                    <#list totp.policy.supportedApplications as app>",
-                                        "                        <li>${app}</li>",
-                                        "                    </#list>",
-                                        "                </#if>"
-                                    ].join("\n")
-                                ),
-                            "utf8"
-                        )
-                    );
-                }
-
                install_common_node_modules: {
                    const commonResourcesDirPath = pathJoin(destDirPath, "keycloak", "common", "resources");

@ -100,18 +47,7 @@ export async function downloadBuiltinKeycloakTheme(params: { keycloakVersion: st
                        break install_and_move_to_common_resources_generated_in_keycloak_v2;
                    }

-                    const packageManager = fs.existsSync(pathJoin(accountV2DirSrcDirPath, "pnpm-lock.yaml")) ? "pnpm" : "npm";
-
-                    if (packageManager === "pnpm") {
-                        try {
-                            child_process.execSync(`which pnpm`);
-                        } catch {
-                            console.log(`Installing pnpm globally`);
-                            child_process.execSync(`npm install -g pnpm`);
-                        }
-                    }
-
-                    child_process.execSync(`${packageManager} install`, { "cwd": accountV2DirSrcDirPath, "stdio": "ignore" });
+                    child_process.execSync("npm install", { "cwd": accountV2DirSrcDirPath, "stdio": "ignore" });

                    const packageJsonFilePath = pathJoin(accountV2DirSrcDirPath, "package.json");

@ -120,12 +56,12 @@ export async function downloadBuiltinKeycloakTheme(params: { keycloakVersion: st
                    const parsedPackageJson = JSON.parse(packageJsonRaw.toString("utf8"));

                    parsedPackageJson.scripts.build = parsedPackageJson.scripts.build
-                        .replace(`${packageManager} run check-types`, "true")
-                        .replace(`${packageManager} run babel`, "true");
+                        .replace("npm run check-types", "true")
+                        .replace("npm run babel", "true");

                    fs.writeFileSync(packageJsonFilePath, Buffer.from(JSON.stringify(parsedPackageJson, null, 2), "utf8"));

-                    child_process.execSync(`${packageManager} run build`, { "cwd": accountV2DirSrcDirPath, "stdio": "ignore" });
+                    child_process.execSync("npm run build", { "cwd": accountV2DirSrcDirPath, "stdio": "ignore" });

                    fs.writeFileSync(packageJsonFilePath, packageJsonRaw);

@ -138,7 +74,7 @@ export async function downloadBuiltinKeycloakTheme(params: { keycloakVersion: st

 async function main() {
    const buildOptions = readBuildOptions({
-        "reactAppRootDirPath": process.cwd(),
+        "projectDirPath": process.cwd(),
        "processArgv": process.argv.slice(2)
    });

@ -150,9 +86,9 @@ async function main() {
    logger.log(`Downloading builtins theme of Keycloak ${keycloakVersion} here ${destDirPath}`);

    await downloadBuiltinKeycloakTheme({
+        "projectDirPath": process.cwd(),
        keycloakVersion,
-        destDirPath,
-        buildOptions
+        destDirPath
    });
 }

--- a/src/bin/eject-keycloak-page.ts
+++ b/src/bin/eject-keycloak-page.ts
@ -2,7 +2,14 @@

 import { getProjectRoot } from "./tools/getProjectRoot";
 import cliSelect from "cli-select";
-import { loginThemePageIds, accountThemePageIds, type LoginThemePageId, type AccountThemePageId } from "./keycloakify/generateFtl";
+import {
+    loginThemePageIds,
+    accountThemePageIds,
+    type LoginThemePageId,
+    type AccountThemePageId,
+    themeTypes,
+    type ThemeType
+} from "./keycloakify/generateFtl";
 import { capitalize } from "tsafe/capitalize";
 import { readFile, writeFile } from "fs/promises";
 import { existsSync } from "fs";
@ -10,13 +17,10 @@ import { join as pathJoin, relative as pathRelative } from "path";
 import { kebabCaseToCamelCase } from "./tools/kebabCaseToSnakeCase";
 import { assert, Equals } from "tsafe/assert";
 import { getThemeSrcDirPath } from "./getSrcDirPath";
-import { themeTypes, type ThemeType } from "./constants";

 (async () => {
    console.log("Select a theme type");

-    const reactAppRootDirPath = process.cwd();
-
    const { value: themeType } = await cliSelect<ThemeType>({
        "values": [...themeTypes]
    }).catch(() => {
@ -45,7 +49,7 @@ import { themeTypes, type ThemeType } from "./constants";

    const pageBasename = capitalize(kebabCaseToCamelCase(pageId)).replace(/ftl$/, "tsx");

-    const { themeSrcDirPath } = getThemeSrcDirPath({ reactAppRootDirPath });
+    const { themeSrcDirPath } = getThemeSrcDirPath({ "projectDirPath": process.cwd() });

    const targetFilePath = pathJoin(themeSrcDirPath, themeType, "pages", pageBasename);

--- a/src/bin/getSrcDirPath.ts
+++ b/src/bin/getSrcDirPath.ts
@ -2,15 +2,15 @@ import * as fs from "fs";
 import { exclude } from "tsafe";
 import { crawl } from "./tools/crawl";
 import { join as pathJoin } from "path";
-import { themeTypes } from "./constants";
+import { themeTypes } from "./keycloakify/generateFtl";

 const themeSrcDirBasenames = ["keycloak-theme", "keycloak_theme"];

 /** Can't catch error, if the directory isn't found, this function will just exit the process with an error message. */
-export function getThemeSrcDirPath(params: { reactAppRootDirPath: string }) {
-    const { reactAppRootDirPath } = params;
+export function getThemeSrcDirPath(params: { projectDirPath: string }) {
+    const { projectDirPath } = params;

-    const srcDirPath = pathJoin(reactAppRootDirPath, "src");
+    const srcDirPath = pathJoin(projectDirPath, "src");

    const themeSrcDirPath: string | undefined = crawl({ "dirPath": srcDirPath, "returnedPathsType": "relative to dirPath" })
        .map(fileRelativePath => {
--- a/src/bin/initialize-email-theme.ts
+++ b/src/bin/initialize-email-theme.ts
@ -10,17 +10,17 @@ import { getLogger } from "./tools/logger";
 import { getThemeSrcDirPath } from "./getSrcDirPath";

 export async function main() {
-    const reactAppRootDirPath = process.cwd();
+    const projectDirPath = process.cwd();

-    const buildOptions = readBuildOptions({
-        reactAppRootDirPath,
+    const { isSilent } = readBuildOptions({
+        projectDirPath,
        "processArgv": process.argv.slice(2)
    });

-    const logger = getLogger({ "isSilent": buildOptions.isSilent });
+    const logger = getLogger({ isSilent });

    const { themeSrcDirPath } = getThemeSrcDirPath({
-        reactAppRootDirPath
+        projectDirPath
    });

    const emailThemeSrcDirPath = pathJoin(themeSrcDirPath, "email");
@ -36,9 +36,9 @@ export async function main() {
    const builtinKeycloakThemeTmpDirPath = pathJoin(emailThemeSrcDirPath, "..", "tmp_xIdP3_builtin_keycloak_theme");

    await downloadBuiltinKeycloakTheme({
+        projectDirPath,
        keycloakVersion,
-        "destDirPath": builtinKeycloakThemeTmpDirPath,
-        buildOptions
+        "destDirPath": builtinKeycloakThemeTmpDirPath
    });

    transformCodebase({
--- a/src/bin/keycloakify/BuildOptions.ts
+++ b/src/bin/keycloakify/BuildOptions.ts
@ -1,34 +1,34 @@
+import { assert } from "tsafe/assert";
+import { id } from "tsafe/id";
 import { parse as urlParse } from "url";
-import { getParsedPackageJson } from "./parsedPackageJson";
-import { join as pathJoin } from "path";
+import { typeGuard } from "tsafe/typeGuard";
+import { symToStr } from "tsafe/symToStr";
+import { bundlers, getParsedPackageJson, type Bundler } from "./parsedPackageJson";
+import { join as pathJoin, sep as pathSep } from "path";
 import parseArgv from "minimist";
-import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath";

 /** Consolidated build option gathered form CLI arguments and config in package.json */
 export type BuildOptions = {
    isSilent: boolean;
    themeVersion: string;
-    themeNames: string[];
+    themeName: string;
+    extraThemeNames: string[];
    extraThemeProperties: string[] | undefined;
    groupId: string;
    artifactId: string;
-    doCreateJar: boolean;
-    loginThemeResourcesFromKeycloakVersion: string;
-    reactAppRootDirPath: string;
+    bundler: Bundler;
+    keycloakVersionDefaultAssets: string;
    /** Directory of your built react project. Defaults to {cwd}/build */
    reactAppBuildDirPath: string;
    /** Directory that keycloakify outputs to. Defaults to {cwd}/build_keycloak */
    keycloakifyBuildDirPath: string;
-    publicDirPath: string;
-    cacheDirPath: string;
    /** If your app is hosted under a subpath, it's the case in CRA if you have "homepage": "https://example.com/my-app" in your package.json
     * In this case the urlPathname will be "/my-app/" */
    urlPathname: string | undefined;
-    doBuildRetrocompatAccountTheme: boolean;
 };

-export function readBuildOptions(params: { reactAppRootDirPath: string; processArgv: string[] }): BuildOptions {
-    const { reactAppRootDirPath, processArgv } = params;
+export function readBuildOptions(params: { projectDirPath: string; processArgv: string[] }): BuildOptions {
+    const { projectDirPath, processArgv } = params;

    const { isSilentCliParamProvided } = (() => {
        const argv = parseArgv(processArgv);
@ -38,36 +38,35 @@ export function readBuildOptions(params: { reactAppRootDirPath: string; processA
        };
    })();

-    const parsedPackageJson = getParsedPackageJson({ reactAppRootDirPath });
+    const parsedPackageJson = getParsedPackageJson({ projectDirPath });

    const { name, keycloakify = {}, version, homepage } = parsedPackageJson;

-    const { extraThemeProperties, groupId, artifactId, doCreateJar, loginThemeResourcesFromKeycloakVersion } = keycloakify ?? {};
+    const { extraThemeProperties, groupId, artifactId, bundler, keycloakVersionDefaultAssets, extraThemeNames = [] } = keycloakify ?? {};

-    const themeNames = (() => {
-        if (keycloakify.themeName === undefined) {
-            return [
-                name
-                    .replace(/^@(.*)/, "$1")
-                    .split("/")
-                    .join("-")
-            ];
-        }
-
-        if (typeof keycloakify.themeName === "string") {
-            return [keycloakify.themeName];
-        }
-
-        return keycloakify.themeName;
-    })();
+    const themeName =
+        keycloakify.themeName ??
+        name
+            .replace(/^@(.*)/, "$1")
+            .split("/")
+            .join("-");

    return {
-        reactAppRootDirPath,
-        themeNames,
-        "doCreateJar": doCreateJar ?? true,
-        "artifactId": process.env.KEYCLOAKIFY_ARTIFACT_ID ?? artifactId ?? `${themeNames[0]}-keycloak-theme`,
+        themeName,
+        extraThemeNames,
+        "bundler": (() => {
+            const { KEYCLOAKIFY_BUNDLER } = process.env;
+
+            assert(
+                typeGuard<Bundler | undefined>(KEYCLOAKIFY_BUNDLER, [undefined, ...id<readonly string[]>(bundlers)].includes(KEYCLOAKIFY_BUNDLER)),
+                `${symToStr({ KEYCLOAKIFY_BUNDLER })} should be one of ${bundlers.join(", ")}`
+            );
+
+            return KEYCLOAKIFY_BUNDLER ?? bundler ?? "keycloakify";
+        })(),
+        "artifactId": process.env.KEYCLOAKIFY_ARTIFACT_ID ?? artifactId ?? `${themeName}-keycloak-theme`,
        "groupId": (() => {
-            const fallbackGroupId = `${themeNames[0]}.keycloak`;
+            const fallbackGroupId = `${themeName}.keycloak`;

            return (
                process.env.KEYCLOAKIFY_GROUP_ID ??
@ -84,58 +83,41 @@ export function readBuildOptions(params: { reactAppRootDirPath: string; processA
        "themeVersion": process.env.KEYCLOAKIFY_THEME_VERSION ?? process.env.KEYCLOAKIFY_VERSION ?? version ?? "0.0.0",
        extraThemeProperties,
        "isSilent": isSilentCliParamProvided,
-        "loginThemeResourcesFromKeycloakVersion": loginThemeResourcesFromKeycloakVersion ?? "11.0.3",
-        "publicDirPath": (() => {
-            let { PUBLIC_DIR_PATH } = process.env;
-
-            if (PUBLIC_DIR_PATH !== undefined) {
-                return getAbsoluteAndInOsFormatPath({
-                    "pathIsh": PUBLIC_DIR_PATH,
-                    "cwd": reactAppRootDirPath
-                });
-            }
-
-            return pathJoin(reactAppRootDirPath, "public");
-        })(),
+        "keycloakVersionDefaultAssets": keycloakVersionDefaultAssets ?? "11.0.3",
        "reactAppBuildDirPath": (() => {
-            const { reactAppBuildDirPath } = parsedPackageJson.keycloakify ?? {};
+            let { reactAppBuildDirPath = undefined } = parsedPackageJson.keycloakify ?? {};

-            if (reactAppBuildDirPath !== undefined) {
-                return getAbsoluteAndInOsFormatPath({
-                    "pathIsh": reactAppBuildDirPath,
-                    "cwd": reactAppRootDirPath
-                });
+            if (reactAppBuildDirPath === undefined) {
+                return pathJoin(projectDirPath, "build");
            }

-            return pathJoin(reactAppRootDirPath, "build");
+            if (pathSep === "\\") {
+                reactAppBuildDirPath = reactAppBuildDirPath.replace(/\//g, pathSep);
+            }
+
+            if (reactAppBuildDirPath.startsWith(`.${pathSep}`)) {
+                return pathJoin(projectDirPath, reactAppBuildDirPath);
+            }
+
+            return reactAppBuildDirPath;
        })(),
        "keycloakifyBuildDirPath": (() => {
-            const { keycloakifyBuildDirPath } = parsedPackageJson.keycloakify ?? {};
+            let { keycloakifyBuildDirPath = undefined } = parsedPackageJson.keycloakify ?? {};

-            if (keycloakifyBuildDirPath !== undefined) {
-                return getAbsoluteAndInOsFormatPath({
-                    "pathIsh": keycloakifyBuildDirPath,
-                    "cwd": reactAppRootDirPath
-                });
+            if (keycloakifyBuildDirPath === undefined) {
+                return pathJoin(projectDirPath, "build_keycloak");
            }

-            return pathJoin(reactAppRootDirPath, "build_keycloak");
+            if (pathSep === "\\") {
+                keycloakifyBuildDirPath = keycloakifyBuildDirPath.replace(/\//g, pathSep);
+            }
+
+            if (keycloakifyBuildDirPath.startsWith(`.${pathSep}`)) {
+                return pathJoin(projectDirPath, keycloakifyBuildDirPath);
+            }
+
+            return keycloakifyBuildDirPath;
        })(),
-        "cacheDirPath": pathJoin(
-            (() => {
-                let { XDG_CACHE_HOME } = process.env;
-
-                if (XDG_CACHE_HOME !== undefined) {
-                    return getAbsoluteAndInOsFormatPath({
-                        "pathIsh": XDG_CACHE_HOME,
-                        "cwd": reactAppRootDirPath
-                    });
-                }
-
-                return pathJoin(reactAppRootDirPath, "node_modules", ".cache");
-            })(),
-            "keycloakify"
-        ),
        "urlPathname": (() => {
            const { homepage } = parsedPackageJson;

@ -151,7 +133,6 @@ export function readBuildOptions(params: { reactAppRootDirPath: string; processA

            const out = url.pathname.replace(/([^/])$/, "$1/");
            return out === "/" ? undefined : out;
-        })(),
-        "doBuildRetrocompatAccountTheme": parsedPackageJson.keycloakify?.doBuildRetrocompatAccountTheme ?? true
+        })()
    };
 }
--- a/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
+++ b/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
@ -408,6 +408,14 @@
    out["themeName"] = "KEYCLOAKIFY_THEME_NAME_cXxKd3xEer";
    out["pageId"] = "${pageId}";

+    try {
+
+        out["url"]["resourcesCommonPath"] = out["url"]["resourcesPath"] + "/" + "RESOURCES_COMMON_cLsLsMrtDkpVv";
+
+    } catch(error) {
+
+    }
+
    return out;

 })()
@ -423,7 +431,7 @@
        <#if isHash>

            <#if path?size gt 10>
-                <#return "ABORT: Too many recursive calls">
+                <#return "ABORT: Too many recursive calls, path: " + path?join(".")>
            </#if>

            <#local keys = "">
@ -455,9 +463,10 @@
                        <#-- https://github.com/keycloakify/keycloakify/issues/91#issue-1212319466 (reports with error.ftl and Kc18) -->
                        <#-- https://github.com/keycloakify/keycloakify/issues/109#issuecomment-1134610163 -->
                        <#-- https://github.com/keycloakify/keycloakify/issues/357 -->
+                        <#-- https://github.com/keycloakify/keycloakify/discussions/406#discussioncomment-7514787 -->
                        key == "loginAction" && 
                        are_same_path(path, ["url"]) && 
-                        ["saml-post-form.ftl", "error.ftl", "info.ftl", "login-oauth-grant.ftl", "logout-confirm.ftl"]?seq_contains(pageId) &&
+                        ["saml-post-form.ftl", "error.ftl", "info.ftl", "login-oauth-grant.ftl", "logout-confirm.ftl", "login-oauth2-device-verify-user-code.ftl"]?seq_contains(pageId) &&
                        !(auth?has_content && auth.showTryAnotherWayLink())
                    ) || (
                        <#-- https://github.com/keycloakify/keycloakify/issues/362 -->
@ -479,25 +488,37 @@
                        are_same_path(path, ["realm"]) &&
                        !["name", "displayName", "displayNameHtml", "internationalizationEnabled", "registrationEmailAsUsername" ]?seq_contains(key)
                    ) || (
-                        "applications.ftl" == pageId &&
-                        are_same_path(path, ["applications", "applications", "*", "client", "realm"])
+                        "smtpConfig" == key &&
+                        are_same_path(path, ["realm"])
                    ) || (
                        "applications.ftl" == pageId &&
-                        "masterAdminClient" == key
+                        is_subpath(path, ["applications", "applications"]) &&
+                        ( 
+                            key == "realm" || 
+                            key == "container" 
+                        )
+                    ) || (
+                        are_same_path(path, ["user"]) &&
+                        key == "delegateForUpdate"
                    )
                >
-                    <#local out_seq += ["/*If you need '" + key + "' on " + pageId + ", please submit an issue to the Keycloakify repo*/"]>
+                    <#local out_seq += ["/*If you need '" + path?join(".") + "." + key + "' on " + pageId + ", please submit an issue to the Keycloakify repo*/"]>
                    <#continue>
                </#if>

-                <#if pageId == "register.ftl" && key == "attemptedUsername" && are_same_path(path, ["auth"])>
+                <#-- https://github.com/keycloakify/keycloakify/discussions/406 -->
+                <#if (
+                    ["register.ftl", "info.ftl", "login.ftl", "login-update-password.ftl", "login-oauth2-device-verify-user-code.ftl"]?seq_contains(pageId) && 
+                    key == "attemptedUsername" && are_same_path(path, ["auth"])
+                )>
                    <#attempt>
                        <#-- https://github.com/keycloak/keycloak/blob/3a2bf0c04bcde185e497aaa32d0bb7ab7520cf4a/themes/src/main/resources/theme/base/login/template.ftl#L63 -->
-                        <#-- https://github.com/keycloakify/keycloakify/discussions/406 -->
                        <#if !(auth?has_content && auth.showUsername() && !auth.showResetCredentials())>
+                            <#local out_seq += ["/*If you need '" + key + "' on " + pageId + ", please submit an issue to the Keycloakify repo*/"]>
                            <#continue>
                        </#if>
                    <#recover>
+                        <#local out_seq += ["/*Testing if attemptedUsername should be skipped throwed an exception */"]>
                    </#attempt>
                </#if>
                
@ -650,9 +671,9 @@
        <#return "ABORT: Couldn't convert into string non hash, non method, non boolean, non enumerable object">

 </#function>
-<#function are_same_path path searchedPath>
+<#function is_subpath path searchedPath>

-    <#if path?size != searchedPath?size>
+    <#if path?size < searchedPath?size>
        <#return false>
    </#if>

@ -660,8 +681,14 @@

    <#list path as property>

+        <#if i == searchedPath?size >
+            <#continue>
+        </#if>
+
        <#local searchedProperty=searchedPath[i]>

+        <#local i+= 1>
+
        <#if searchedProperty?is_string && searchedProperty == "*">
            <#continue>
        </#if>
@ -678,11 +705,13 @@
            <#return false>
        </#if>

-        <#local i+= 1>
-
    </#list>

    <#return true>

 </#function>
+
+<#function are_same_path path searchedPath>
+    <#return path?size == searchedPath?size && is_subpath(path, searchedPath)>
+</#function>
 </script>
--- a/src/bin/keycloakify/generateFtl/generateFtl.ts
+++ b/src/bin/keycloakify/generateFtl/generateFtl.ts
@ -8,9 +8,13 @@ import { objectKeys } from "tsafe/objectKeys";
 import { ftlValuesGlobalName } from "../ftlValuesGlobalName";
 import type { BuildOptions } from "../BuildOptions";
 import { assert } from "tsafe/assert";
-import type { ThemeType } from "../../constants";
+
+export const themeTypes = ["login", "account"] as const;
+
+export type ThemeType = (typeof themeTypes)[number];

 export type BuildOptionsLike = {
+    themeName: string;
    themeVersion: string;
    urlPathname: string | undefined;
 };
@ -18,7 +22,6 @@ export type BuildOptionsLike = {
 assert<BuildOptions extends BuildOptionsLike ? true : false>();

 export function generateFtlFilesCodeFactory(params: {
-    themeName: string;
    indexHtmlCode: string;
    //NOTE: Expected to be an empty object if external assets mode is enabled.
    cssGlobalsToDefine: Record<string, string>;
@ -27,7 +30,7 @@ export function generateFtlFilesCodeFactory(params: {
    themeType: ThemeType;
    fieldNames: string[];
 }) {
-    const { themeName, cssGlobalsToDefine, indexHtmlCode, buildOptions, keycloakifyVersion, themeType, fieldNames } = params;
+    const { cssGlobalsToDefine, indexHtmlCode, buildOptions, keycloakifyVersion, themeType, fieldNames } = params;

    const $ = cheerio.load(indexHtmlCode);

@ -101,7 +104,7 @@ export function generateFtlFilesCodeFactory(params: {
            .replace("KEYCLOAKIFY_VERSION_xEdKd3xEdr", keycloakifyVersion)
            .replace("KEYCLOAKIFY_THEME_VERSION_sIgKd3xEdr3dx", buildOptions.themeVersion)
            .replace("KEYCLOAKIFY_THEME_TYPE_dExKd3xEdr", themeType)
-            .replace("KEYCLOAKIFY_THEME_NAME_cXxKd3xEer", themeName),
+            .replace("KEYCLOAKIFY_THEME_NAME_cXxKd3xEer", buildOptions.themeName),
        "<!-- xIdLqMeOedErIdLsPdNdI9dSlxI -->": [
            "<#if scripts??>",
            "    <#list scripts as script>",
--- a/src/bin/keycloakify/generateJavaStackFiles.ts
+++ b/src/bin/keycloakify/generateJavaStackFiles.ts
@ -0,0 +1,84 @@
+import * as fs from "fs";
+import { join as pathJoin, dirname as pathDirname } from "path";
+import { assert } from "tsafe/assert";
+import type { BuildOptions } from "./BuildOptions";
+import type { ThemeType } from "./generateFtl";
+
+export type BuildOptionsLike = {
+    themeName: string;
+    extraThemeNames: string[];
+    groupId: string;
+    artifactId: string;
+    themeVersion: string;
+};
+
+assert<BuildOptions extends BuildOptionsLike ? true : false>();
+
+export function generateJavaStackFiles(params: {
+    keycloakThemeBuildingDirPath: string;
+    implementedThemeTypes: Record<ThemeType | "email", boolean>;
+    buildOptions: BuildOptionsLike;
+}): {
+    jarFilePath: string;
+} {
+    const {
+        buildOptions: { groupId, themeName, extraThemeNames, themeVersion, artifactId },
+        keycloakThemeBuildingDirPath,
+        implementedThemeTypes
+    } = params;
+
+    {
+        const { pomFileCode } = (function generatePomFileCode(): {
+            pomFileCode: string;
+        } {
+            const pomFileCode = [
+                `<?xml version="1.0"?>`,
+                `<project xmlns="http://maven.apache.org/POM/4.0.0"`,
+                `	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`,
+                `	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">`,
+                `	<modelVersion>4.0.0</modelVersion>`,
+                `	<groupId>${groupId}</groupId>`,
+                `	<artifactId>${artifactId}</artifactId>`,
+                `	<version>${themeVersion}</version>`,
+                `	<name>${artifactId}</name>`,
+                `	<description />`,
+                `</project>`
+            ].join("\n");
+
+            return { pomFileCode };
+        })();
+
+        fs.writeFileSync(pathJoin(keycloakThemeBuildingDirPath, "pom.xml"), Buffer.from(pomFileCode, "utf8"));
+    }
+
+    {
+        const themeManifestFilePath = pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "META-INF", "keycloak-themes.json");
+
+        try {
+            fs.mkdirSync(pathDirname(themeManifestFilePath));
+        } catch {}
+
+        fs.writeFileSync(
+            themeManifestFilePath,
+            Buffer.from(
+                JSON.stringify(
+                    {
+                        "themes": [themeName, ...extraThemeNames].map(themeName => ({
+                            "name": themeName,
+                            "types": Object.entries(implementedThemeTypes)
+                                .filter(([, isImplemented]) => isImplemented)
+                                .map(([themeType]) => themeType)
+                        }))
+                    },
+                    null,
+                    2
+                ),
+                "utf8"
+            )
+        );
+    }
+
+    return {
+        "jarFilePath": pathJoin(keycloakThemeBuildingDirPath, "target", `${artifactId}-${themeVersion}.jar`)
+    };
+}
--- a/src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts
+++ b/src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts
@ -1,101 +0,0 @@
-import * as fs from "fs";
-import { join as pathJoin, dirname as pathDirname } from "path";
-import { assert } from "tsafe/assert";
-import { Reflect } from "tsafe/Reflect";
-import type { BuildOptions } from "../BuildOptions";
-import { resources_common, lastKeycloakVersionWithAccountV1, accountV1 } from "../../constants";
-import { downloadBuiltinKeycloakTheme } from "../../download-builtin-keycloak-theme";
-import { transformCodebase } from "../../tools/transformCodebase";
-
-export type BuildOptionsLike = {
-    keycloakifyBuildDirPath: string;
-    cacheDirPath: string;
-};
-
-{
-    const buildOptions = Reflect<BuildOptions>();
-
-    assert<typeof buildOptions extends BuildOptionsLike ? true : false>();
-}
-
-export async function bringInAccountV1(params: { buildOptions: BuildOptionsLike }) {
-    const { buildOptions } = params;
-
-    const builtinKeycloakThemeTmpDirPath = pathJoin(buildOptions.keycloakifyBuildDirPath, "..", "tmp_yxdE2_builtin_keycloak_theme");
-
-    await downloadBuiltinKeycloakTheme({
-        "destDirPath": builtinKeycloakThemeTmpDirPath,
-        "keycloakVersion": lastKeycloakVersionWithAccountV1,
-        buildOptions
-    });
-
-    const accountV1DirPath = pathJoin(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme", accountV1, "account");
-
-    transformCodebase({
-        "srcDirPath": pathJoin(builtinKeycloakThemeTmpDirPath, "base", "account"),
-        "destDirPath": accountV1DirPath
-    });
-
-    const commonResourceFilePaths = [
-        "node_modules/patternfly/dist/css/patternfly.min.css",
-        "node_modules/patternfly/dist/css/patternfly-additions.min.css",
-        ...[
-            "OpenSans-Light-webfont.woff2",
-            "OpenSans-Regular-webfont.woff2",
-            "OpenSans-Bold-webfont.woff2",
-            "OpenSans-Semibold-webfont.woff2",
-            "OpenSans-Bold-webfont.woff",
-            "OpenSans-Light-webfont.woff",
-            "OpenSans-Regular-webfont.woff",
-            "OpenSans-Semibold-webfont.woff",
-            "OpenSans-Regular-webfont.ttf",
-            "OpenSans-Light-webfont.ttf",
-            "OpenSans-Semibold-webfont.ttf",
-            "OpenSans-Bold-webfont.ttf"
-        ].map(path => `node_modules/patternfly/dist/fonts/${path}`)
-    ];
-
-    for (const relativeFilePath of commonResourceFilePaths.map(path => pathJoin(...path.split("/")))) {
-        const destFilePath = pathJoin(accountV1DirPath, "resources", resources_common, relativeFilePath);
-
-        fs.mkdirSync(pathDirname(destFilePath), { "recursive": true });
-
-        fs.cpSync(pathJoin(builtinKeycloakThemeTmpDirPath, "keycloak", "common", "resources", relativeFilePath), destFilePath);
-    }
-
-    const resourceFilePaths = ["css/account.css", "img/icon-sidebar-active.png", "img/logo.png"];
-
-    for (const relativeFilePath of resourceFilePaths.map(path => pathJoin(...path.split("/")))) {
-        const destFilePath = pathJoin(accountV1DirPath, "resources", relativeFilePath);
-
-        fs.mkdirSync(pathDirname(destFilePath), { "recursive": true });
-
-        fs.cpSync(pathJoin(builtinKeycloakThemeTmpDirPath, "keycloak", "account", "resources", relativeFilePath), destFilePath);
-    }
-
-    fs.rmSync(builtinKeycloakThemeTmpDirPath, { "recursive": true });
-
-    fs.writeFileSync(
-        pathJoin(accountV1DirPath, "theme.properties"),
-        Buffer.from(
-            [
-                "accountResourceProvider=account-v1",
-                "",
-                "locales=ar,ca,cs,da,de,en,es,fr,fi,hu,it,ja,lt,nl,no,pl,pt-BR,ru,sk,sv,tr,zh-CN",
-                "",
-                "styles=" + [...resourceFilePaths, ...commonResourceFilePaths.map(path => `resources-common/${path}`)].join(" "),
-                "",
-                "##### css classes for form buttons",
-                "# main class used for all buttons",
-                "kcButtonClass=btn",
-                "# classes defining priority of the button - primary or default (there is typically only one priority button for the form)",
-                "kcButtonPrimaryClass=btn-primary",
-                "kcButtonDefaultClass=btn-default",
-                "# classes defining size of the button",
-                "kcButtonLargeClass=btn-lg",
-                ""
-            ].join("\n"),
-            "utf8"
-        )
-    );
-}
--- a/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts
+++ b/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts
@ -1,141 +0,0 @@
-import * as fs from "fs";
-import { join as pathJoin, dirname as pathDirname } from "path";
-import { assert } from "tsafe/assert";
-import { Reflect } from "tsafe/Reflect";
-import type { BuildOptions } from "../BuildOptions";
-import { type ThemeType, retrocompatPostfix, accountV1 } from "../../constants";
-import { bringInAccountV1 } from "./bringInAccountV1";
-
-export type BuildOptionsLike = {
-    groupId: string;
-    artifactId: string;
-    themeVersion: string;
-    cacheDirPath: string;
-    keycloakifyBuildDirPath: string;
-    themeNames: string[];
-    doBuildRetrocompatAccountTheme: boolean;
-};
-
-{
-    const buildOptions = Reflect<BuildOptions>();
-
-    assert<typeof buildOptions extends BuildOptionsLike ? true : false>();
-}
-
-export async function generateJavaStackFiles(params: {
-    implementedThemeTypes: Record<ThemeType | "email", boolean>;
-    buildOptions: BuildOptionsLike;
-}): Promise<{
-    jarFilePath: string;
-}> {
-    const { implementedThemeTypes, buildOptions } = params;
-
-    {
-        const { pomFileCode } = (function generatePomFileCode(): {
-            pomFileCode: string;
-        } {
-            const pomFileCode = [
-                `<?xml version="1.0"?>`,
-                `<project xmlns="http://maven.apache.org/POM/4.0.0"`,
-                `	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"`,
-                `	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">`,
-                `  <modelVersion>4.0.0</modelVersion>`,
-                `	<groupId>${buildOptions.groupId}</groupId>`,
-                `	<artifactId>${buildOptions.artifactId}</artifactId>`,
-                `	<version>${buildOptions.themeVersion}</version>`,
-                `	<name>${buildOptions.artifactId}</name>`,
-                `  <description />`,
-                `  <packaging>jar</packaging>`,
-                `  <properties>`,
-                `    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>`,
-                `  </properties>`,
-                `  <build>`,
-                `    <plugins>`,
-                `      <plugin>`,
-                `        <groupId>org.apache.maven.plugins</groupId>`,
-                `        <artifactId>maven-shade-plugin</artifactId>`,
-                `	<version>3.5.1</version>`,
-                `        <executions>`,
-                `          <execution>`,
-                `            <phase>package</phase>`,
-                `            <goals>`,
-                `              <goal>shade</goal>`,
-                `            </goals>`,
-                `          </execution>`,
-                `        </executions>`,
-                `      </plugin>`,
-                `    </plugins>`,
-                `  </build>`,
-                `  <dependencies>`,
-                `    <dependency>`,
-                `      <groupId>io.phasetwo.keycloak</groupId>`,
-                `      <artifactId>keycloak-account-v1</artifactId>`,
-                `      <version>0.1</version>`,
-                `    </dependency>`,
-                `  </dependencies>`,
-                `</project>`
-            ].join("\n");
-
-            return { pomFileCode };
-        })();
-
-        fs.writeFileSync(pathJoin(buildOptions.keycloakifyBuildDirPath, "pom.xml"), Buffer.from(pomFileCode, "utf8"));
-    }
-
-    if (implementedThemeTypes.account) {
-        await bringInAccountV1({ buildOptions });
-    }
-
-    {
-        const themeManifestFilePath = pathJoin(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "META-INF", "keycloak-themes.json");
-
-        try {
-            fs.mkdirSync(pathDirname(themeManifestFilePath));
-        } catch {}
-
-        fs.writeFileSync(
-            themeManifestFilePath,
-            Buffer.from(
-                JSON.stringify(
-                    {
-                        "themes": [
-                            ...(!implementedThemeTypes.account
-                                ? []
-                                : [
-                                      {
-                                          "name": accountV1,
-                                          "types": ["account"]
-                                      }
-                                  ]),
-                            ...buildOptions.themeNames
-                                .map(themeName => [
-                                    {
-                                        "name": themeName,
-                                        "types": Object.entries(implementedThemeTypes)
-                                            .filter(([, isImplemented]) => isImplemented)
-                                            .map(([themeType]) => themeType)
-                                    },
-                                    ...(!implementedThemeTypes.account || !buildOptions.doBuildRetrocompatAccountTheme
-                                        ? []
-                                        : [
-                                              {
-                                                  "name": `${themeName}${retrocompatPostfix}`,
-                                                  "types": ["account"]
-                                              }
-                                          ])
-                                ])
-                                .flat()
-                        ]
-                    },
-                    null,
-                    2
-                ),
-                "utf8"
-            )
-        );
-    }
-
-    return {
-        "jarFilePath": pathJoin(buildOptions.keycloakifyBuildDirPath, "target", `${buildOptions.artifactId}-${buildOptions.themeVersion}.jar`)
-    };
-}
--- a/src/bin/keycloakify/generateJavaStackFiles/index.ts
+++ b/src/bin/keycloakify/generateJavaStackFiles/index.ts
@ -1 +0,0 @@
-export * from "./generateJavaStackFiles";
--- a/src/bin/keycloakify/generateStartKeycloakTestingContainer.ts
+++ b/src/bin/keycloakify/generateStartKeycloakTestingContainer.ts
@ -1,60 +1,53 @@
 import * as fs from "fs";
-import { join as pathJoin, relative as pathRelative, basename as pathBasename } from "path";
+import { join as pathJoin } from "path";
 import { assert } from "tsafe/assert";
-import { Reflect } from "tsafe/Reflect";
 import type { BuildOptions } from "./BuildOptions";

 export type BuildOptionsLike = {
-    keycloakifyBuildDirPath: string;
+    themeName: string;
+    extraThemeNames: string[];
 };

-{
-    const buildOptions = Reflect<BuildOptions>();
-
-    assert<typeof buildOptions extends BuildOptionsLike ? true : false>();
-}
+assert<BuildOptions extends BuildOptionsLike ? true : false>();

 generateStartKeycloakTestingContainer.basename = "start_keycloak_testing_container.sh";

 const containerName = "keycloak-testing-container";

 /** Files for being able to run a hot reload keycloak container */
-export function generateStartKeycloakTestingContainer(params: { jarFilePath: string; keycloakVersion: string; buildOptions: BuildOptionsLike }) {
-    const { jarFilePath, keycloakVersion, buildOptions } = params;
-
-    const themeRelativeDirPath = pathJoin("src", "main", "resources", "theme");
-    const themeDirPath = pathJoin(buildOptions.keycloakifyBuildDirPath, themeRelativeDirPath);
+export function generateStartKeycloakTestingContainer(params: {
+    keycloakVersion: string;
+    keycloakThemeBuildingDirPath: string;
+    buildOptions: BuildOptionsLike;
+}) {
+    const {
+        keycloakThemeBuildingDirPath,
+        keycloakVersion,
+        buildOptions: { themeName, extraThemeNames }
+    } = params;

    fs.writeFileSync(
-        pathJoin(buildOptions.keycloakifyBuildDirPath, generateStartKeycloakTestingContainer.basename),
+        pathJoin(keycloakThemeBuildingDirPath, generateStartKeycloakTestingContainer.basename),
        Buffer.from(
            [
                "#!/usr/bin/env bash",
-                `# If you want to test with Keycloak version prior to 23 use the retrocompat-${pathBasename(jarFilePath)}`,
                "",
                `docker rm ${containerName} || true`,
                "",
-                `cd "${buildOptions.keycloakifyBuildDirPath}"`,
+                `cd "${keycloakThemeBuildingDirPath.replace(/\\/g, "/")}"`,
                "",
                "docker run \\",
                "   -p 8080:8080 \\",
                `   --name ${containerName} \\`,
                "   -e KEYCLOAK_ADMIN=admin \\",
                "   -e KEYCLOAK_ADMIN_PASSWORD=admin \\",
-                `   -v "${pathJoin(
-                    "$(pwd)",
-                    pathRelative(buildOptions.keycloakifyBuildDirPath, jarFilePath)
-                )}":"/opt/keycloak/providers/${pathBasename(jarFilePath)}" \\`,
-                ...fs
-                    .readdirSync(themeDirPath)
-                    .filter(name => fs.lstatSync(pathJoin(themeDirPath, name)).isDirectory())
-                    .map(
-                        themeName =>
-                            `   -v "${pathJoin("$(pwd)", themeRelativeDirPath, themeName).replace(
-                                /\\/g,
-                                "/"
-                            )}":"/opt/keycloak/themes/${themeName}":rw \\`
-                    ),
+                ...[themeName, ...extraThemeNames].map(
+                    themeName =>
+                        `   -v "${pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme", themeName).replace(
+                            /\\/g,
+                            "/"
+                        )}":"/opt/keycloak/themes/${themeName}":rw \\`
+                ),
                `   -it quay.io/keycloak/keycloak:${keycloakVersion} \\`,
                `   start-dev --features=declarative-user-profile`,
                ""
--- a/src/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.ts
+++ b/src/bin/keycloakify/generateTheme/downloadKeycloakStaticResources.ts
@ -1,31 +1,29 @@
 import { transformCodebase } from "../../tools/transformCodebase";
 import * as fs from "fs";
-import { join as pathJoin, dirname as pathDirname } from "path";
+import { join as pathJoin, relative as pathRelative, dirname as pathDirname } from "path";
+import type { ThemeType } from "../generateFtl";
 import { downloadBuiltinKeycloakTheme } from "../../download-builtin-keycloak-theme";
-import { resources_common, type ThemeType } from "../../constants";
-import { BuildOptions } from "../BuildOptions";
-import { assert } from "tsafe/assert";
+import {
+    resourcesCommonDirPathRelativeToPublicDir,
+    resourcesDirPathRelativeToPublicDir,
+    basenameOfKeycloakDirInPublicDir
+} from "../../mockTestingResourcesPath";
 import * as crypto from "crypto";
-
-export type BuildOptionsLike = {
-    cacheDirPath: string;
-};
-
-assert<BuildOptions extends BuildOptionsLike ? true : false>();
+import { assert } from "tsafe/assert";

 export async function downloadKeycloakStaticResources(
    // prettier-ignore
    params: {
+        projectDirPath: string;
        themeType: ThemeType;
        themeDirPath: string;
        keycloakVersion: string;
        usedResources: {
            resourcesCommonFilePaths: string[];
-        } | undefined;
-        buildOptions: BuildOptionsLike;
+        } | undefined
    }
 ) {
-    const { themeType, themeDirPath, keycloakVersion, buildOptions } = params;
+    const { projectDirPath, themeType, themeDirPath, keycloakVersion } = params;

    // NOTE: Hack for 427
    const usedResources = (() => {
@ -54,25 +52,24 @@ export async function downloadKeycloakStaticResources(

    const tmpDirPath = pathJoin(
        themeDirPath,
+        "..",
        `tmp_suLeKsxId_${crypto.createHash("sha256").update(`${themeType}-${keycloakVersion}`).digest("hex").slice(0, 8)}`
    );

    await downloadBuiltinKeycloakTheme({
+        projectDirPath,
        keycloakVersion,
-        "destDirPath": tmpDirPath,
-        buildOptions
+        "destDirPath": tmpDirPath
    });

-    const resourcesPath = pathJoin(themeDirPath, themeType, "resources");
-
    transformCodebase({
        "srcDirPath": pathJoin(tmpDirPath, "keycloak", themeType, "resources"),
-        "destDirPath": resourcesPath
+        "destDirPath": pathJoin(themeDirPath, pathRelative(basenameOfKeycloakDirInPublicDir, resourcesDirPathRelativeToPublicDir))
    });

    transformCodebase({
        "srcDirPath": pathJoin(tmpDirPath, "keycloak", "common", "resources"),
-        "destDirPath": pathJoin(resourcesPath, resources_common),
+        "destDirPath": pathJoin(themeDirPath, pathRelative(basenameOfKeycloakDirInPublicDir, resourcesCommonDirPathRelativeToPublicDir)),
        "transformSourceCode":
            usedResources === undefined
                ? undefined
--- a/src/bin/keycloakify/generateTheme/generateMessageProperties.ts
+++ b/src/bin/keycloakify/generateTheme/generateMessageProperties.ts
@ -1,4 +1,4 @@
-import type { ThemeType } from "../../constants";
+import type { ThemeType } from "../generateFtl";
 import { crawl } from "../../tools/crawl";
 import { join as pathJoin } from "path";
 import { readFileSync } from "fs";
--- a/src/bin/keycloakify/generateTheme/generateTheme.ts
+++ b/src/bin/keycloakify/generateTheme/generateTheme.ts
@ -1,13 +1,13 @@
 import { transformCodebase } from "../../tools/transformCodebase";
 import * as fs from "fs";
-import { join as pathJoin, basename as pathBasename, resolve as pathResolve } from "path";
+import { join as pathJoin } from "path";
 import { replaceImportsFromStaticInJsCode } from "../replacers/replaceImportsFromStaticInJsCode";
 import { replaceImportsInCssCode } from "../replacers/replaceImportsInCssCode";
-import { generateFtlFilesCodeFactory, loginThemePageIds, accountThemePageIds } from "../generateFtl";
-import { themeTypes, type ThemeType, lastKeycloakVersionWithAccountV1, keycloak_resources, retrocompatPostfix, accountV1 } from "../../constants";
+import { generateFtlFilesCodeFactory, loginThemePageIds, accountThemePageIds, themeTypes, type ThemeType } from "../generateFtl";
+import { basenameOfKeycloakDirInPublicDir } from "../../mockTestingResourcesPath";
 import { isInside } from "../../tools/isInside";
 import type { BuildOptions } from "../BuildOptions";
-import { assert, type Equals } from "tsafe/assert";
+import { assert } from "tsafe/assert";
 import { downloadKeycloakStaticResources } from "./downloadKeycloakStaticResources";
 import { readFieldNameUsage } from "./readFieldNameUsage";
 import { readExtraPagesNames } from "./readExtraPageNames";
@ -15,39 +15,36 @@ import { generateMessageProperties } from "./generateMessageProperties";
 import { readStaticResourcesUsage } from "./readStaticResourcesUsage";

 export type BuildOptionsLike = {
+    themeName: string;
    extraThemeProperties: string[] | undefined;
    themeVersion: string;
-    loginThemeResourcesFromKeycloakVersion: string;
+    keycloakVersionDefaultAssets: string;
    urlPathname: string | undefined;
-    keycloakifyBuildDirPath: string;
-    reactAppBuildDirPath: string;
-    cacheDirPath: string;
-    doBuildRetrocompatAccountTheme: boolean;
 };

 assert<BuildOptions extends BuildOptionsLike ? true : false>();

 export async function generateTheme(params: {
-    themeName: string;
+    projectDirPath: string;
+    reactAppBuildDirPath: string;
+    keycloakThemeBuildingDirPath: string;
    themeSrcDirPath: string;
    keycloakifySrcDirPath: string;
    buildOptions: BuildOptionsLike;
    keycloakifyVersion: string;
 }): Promise<void> {
-    const { themeName, themeSrcDirPath, keycloakifySrcDirPath, buildOptions, keycloakifyVersion } = params;
+    const {
+        projectDirPath,
+        reactAppBuildDirPath,
+        keycloakThemeBuildingDirPath,
+        themeSrcDirPath,
+        keycloakifySrcDirPath,
+        buildOptions,
+        keycloakifyVersion
+    } = params;

-    const getThemeTypeDirPath = (params: { themeType: ThemeType | "email"; isRetrocompat?: true }) => {
-        const { themeType, isRetrocompat = false } = params;
-        return pathJoin(
-            buildOptions.keycloakifyBuildDirPath,
-            "src",
-            "main",
-            "resources",
-            "theme",
-            `${themeName}${isRetrocompat ? retrocompatPostfix : ""}`,
-            themeType
-        );
-    };
+    const getThemeDirPath = (themeType: ThemeType | "email") =>
+        pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme", buildOptions.themeName, themeType);

    let allCssGlobalsToDefine: Record<string, string> = {};

@ -58,7 +55,7 @@ export async function generateTheme(params: {
            continue;
        }

-        const themeTypeDirPath = getThemeTypeDirPath({ themeType });
+        const themeDirPath = getThemeDirPath(themeType);

        copy_app_resources_to_theme_path: {
            const isFirstPass = themeType.indexOf(themeType) === 0;
@ -68,13 +65,13 @@ export async function generateTheme(params: {
            }

            transformCodebase({
-                "destDirPath": pathJoin(themeTypeDirPath, "resources", "build"),
-                "srcDirPath": buildOptions.reactAppBuildDirPath,
+                "destDirPath": pathJoin(themeDirPath, "resources", "build"),
+                "srcDirPath": reactAppBuildDirPath,
                "transformSourceCode": ({ filePath, sourceCode }) => {
                    //NOTE: Prevent cycles, excludes the folder we generated for debug in public/
                    if (
                        isInside({
-                            "dirPath": pathJoin(buildOptions.reactAppBuildDirPath, keycloak_resources),
+                            "dirPath": pathJoin(reactAppBuildDirPath, basenameOfKeycloakDirInPublicDir),
                            filePath
                        })
                    ) {
@ -117,8 +114,7 @@ export async function generateTheme(params: {
            generateFtlFilesCode_glob !== undefined
                ? generateFtlFilesCode_glob
                : generateFtlFilesCodeFactory({
-                      themeName,
-                      "indexHtmlCode": fs.readFileSync(pathJoin(buildOptions.reactAppBuildDirPath, "index.html")).toString("utf8"),
+                      "indexHtmlCode": fs.readFileSync(pathJoin(reactAppBuildDirPath, "index.html")).toString("utf8"),
                      "cssGlobalsToDefine": allCssGlobalsToDefine,
                      buildOptions,
                      keycloakifyVersion,
@ -146,77 +142,75 @@ export async function generateTheme(params: {
        ].forEach(pageId => {
            const { ftlCode } = generateFtlFilesCode({ pageId });

-            fs.mkdirSync(themeTypeDirPath, { "recursive": true });
+            fs.mkdirSync(themeDirPath, { "recursive": true });

-            fs.writeFileSync(pathJoin(themeTypeDirPath, pageId), Buffer.from(ftlCode, "utf8"));
+            fs.writeFileSync(pathJoin(themeDirPath, pageId), Buffer.from(ftlCode, "utf8"));
        });

        generateMessageProperties({
            themeSrcDirPath,
            themeType
        }).forEach(({ languageTag, propertiesFileSource }) => {
-            const messagesDirPath = pathJoin(themeTypeDirPath, "messages");
+            const messagesDirPath = pathJoin(themeDirPath, "messages");

-            fs.mkdirSync(pathJoin(themeTypeDirPath, "messages"), { "recursive": true });
+            fs.mkdirSync(pathJoin(themeDirPath, "messages"), { "recursive": true });

            const propertiesFilePath = pathJoin(messagesDirPath, `messages_${languageTag}.properties`);

            fs.writeFileSync(propertiesFilePath, Buffer.from(propertiesFileSource, "utf8"));
        });

+        //TODO: Remove this block we left it for now only for backward compatibility
+        // we now have a separate script for this
+        copy_keycloak_resources_to_public: {
+            const keycloakDirInPublicDir = pathJoin(reactAppBuildDirPath, "..", "public", basenameOfKeycloakDirInPublicDir);
+
+            if (fs.existsSync(keycloakDirInPublicDir)) {
+                break copy_keycloak_resources_to_public;
+            }
+
+            await downloadKeycloakStaticResources({
+                projectDirPath,
+                "keycloakVersion": buildOptions.keycloakVersionDefaultAssets,
+                "themeDirPath": keycloakDirInPublicDir,
+                themeType,
+                "usedResources": undefined
+            });
+
+            if (themeType !== themeTypes[0]) {
+                break copy_keycloak_resources_to_public;
+            }
+
+            fs.writeFileSync(
+                pathJoin(keycloakDirInPublicDir, "README.txt"),
+                Buffer.from(
+                    // prettier-ignore
+                    [
+                        "This is just a test folder that helps develop",
+                        "the login and register page without having to run a Keycloak container"
+                    ].join(" ")
+                )
+            );
+
+            fs.writeFileSync(pathJoin(keycloakDirInPublicDir, ".gitignore"), Buffer.from("*", "utf8"));
+        }
+
        await downloadKeycloakStaticResources({
-            "keycloakVersion": (() => {
-                switch (themeType) {
-                    case "account":
-                        return lastKeycloakVersionWithAccountV1;
-                    case "login":
-                        return buildOptions.loginThemeResourcesFromKeycloakVersion;
-                }
-            })(),
-            "themeDirPath": pathResolve(pathJoin(themeTypeDirPath, "..")),
+            projectDirPath,
+            "keycloakVersion": buildOptions.keycloakVersionDefaultAssets,
+            themeDirPath,
            themeType,
            "usedResources": readStaticResourcesUsage({
                keycloakifySrcDirPath,
                themeSrcDirPath,
                themeType
-            }),
-            buildOptions
+            })
        });

        fs.writeFileSync(
-            pathJoin(themeTypeDirPath, "theme.properties"),
-            Buffer.from(
-                [
-                    `parent=${(() => {
-                        switch (themeType) {
-                            case "account":
-                                return accountV1;
-                            case "login":
-                                return "keycloak";
-                        }
-                        assert<Equals<typeof themeType, never>>(false);
-                    })()}`,
-                    ...(buildOptions.extraThemeProperties ?? [])
-                ].join("\n\n"),
-                "utf8"
-            )
+            pathJoin(themeDirPath, "theme.properties"),
+            Buffer.from([`parent=keycloak`, ...(buildOptions.extraThemeProperties ?? [])].join("\n\n"), "utf8")
        );
-
-        if (themeType === "account" && buildOptions.doBuildRetrocompatAccountTheme) {
-            transformCodebase({
-                "srcDirPath": themeTypeDirPath,
-                "destDirPath": getThemeTypeDirPath({ themeType, "isRetrocompat": true }),
-                "transformSourceCode": ({ filePath, sourceCode }) => {
-                    if (pathBasename(filePath) === "theme.properties") {
-                        return {
-                            "modifiedSourceCode": Buffer.from(sourceCode.toString("utf8").replace(`parent=${accountV1}`, "parent=keycloak"), "utf8")
-                        };
-                    }
-
-                    return { "modifiedSourceCode": sourceCode };
-                }
-            });
-        }
    }

    email: {
@ -228,7 +222,7 @@ export async function generateTheme(params: {

        transformCodebase({
            "srcDirPath": emailThemeSrcDirPath,
-            "destDirPath": getThemeTypeDirPath({ "themeType": "email" })
+            "destDirPath": getThemeDirPath("email")
        });
    }
 }
--- a/src/bin/keycloakify/generateTheme/readExtraPageNames.ts
+++ b/src/bin/keycloakify/generateTheme/readExtraPageNames.ts
@ -1,10 +1,9 @@
 import { crawl } from "../../tools/crawl";
-import { accountThemePageIds, loginThemePageIds } from "../generateFtl";
+import { type ThemeType, accountThemePageIds, loginThemePageIds } from "../generateFtl";
 import { id } from "tsafe/id";
 import { removeDuplicates } from "evt/tools/reducers/removeDuplicates";
 import * as fs from "fs";
 import { join as pathJoin } from "path";
-import type { ThemeType } from "../../constants";

 export function readExtraPagesNames(params: { themeSrcDirPath: string; themeType: ThemeType }): string[] {
    const { themeSrcDirPath, themeType } = params;
--- a/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts
+++ b/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts
@ -2,7 +2,7 @@ import { crawl } from "../../tools/crawl";
 import { removeDuplicates } from "evt/tools/reducers/removeDuplicates";
 import { join as pathJoin } from "path";
 import * as fs from "fs";
-import type { ThemeType } from "../../constants";
+import type { ThemeType } from "../generateFtl";

 /** Assumes the theme type exists */
 export function readFieldNameUsage(params: { keycloakifySrcDirPath: string; themeSrcDirPath: string; themeType: ThemeType }): string[] {
--- a/src/bin/keycloakify/generateTheme/readStaticResourcesUsage.ts
+++ b/src/bin/keycloakify/generateTheme/readStaticResourcesUsage.ts
@ -1,7 +1,7 @@
 import { crawl } from "../../tools/crawl";
 import { join as pathJoin, sep as pathSep } from "path";
 import * as fs from "fs";
-import type { ThemeType } from "../../constants";
+import type { ThemeType } from "../generateFtl";

 /** Assumes the theme type exists */
 export function readStaticResourcesUsage(params: { keycloakifySrcDirPath: string; themeSrcDirPath: string; themeType: ThemeType }): {
--- a/src/bin/keycloakify/keycloakify.ts
+++ b/src/bin/keycloakify/keycloakify.ts
@ -1,21 +1,23 @@
 import { generateTheme } from "./generateTheme";
 import { generateJavaStackFiles } from "./generateJavaStackFiles";
-import { join as pathJoin, relative as pathRelative, basename as pathBasename, dirname as pathDirname, sep as pathSep } from "path";
+import { join as pathJoin, relative as pathRelative, basename as pathBasename, sep as pathSep } from "path";
 import * as child_process from "child_process";
 import { generateStartKeycloakTestingContainer } from "./generateStartKeycloakTestingContainer";
 import * as fs from "fs";
 import { readBuildOptions } from "./BuildOptions";
 import { getLogger } from "../tools/logger";
+import jar from "../tools/jar";
 import { assert } from "tsafe/assert";
+import { Equals } from "tsafe";
 import { getThemeSrcDirPath } from "../getSrcDirPath";
 import { getProjectRoot } from "../tools/getProjectRoot";
 import { objectKeys } from "tsafe/objectKeys";

 export async function main() {
-    const reactAppRootDirPath = process.cwd();
+    const projectDirPath = process.cwd();

    const buildOptions = readBuildOptions({
-        reactAppRootDirPath,
+        projectDirPath,
        "processArgv": process.argv.slice(2)
    });

@ -24,14 +26,19 @@ export async function main() {

    const keycloakifyDirPath = getProjectRoot();

-    const { themeSrcDirPath } = getThemeSrcDirPath({ reactAppRootDirPath });
+    const { themeSrcDirPath } = getThemeSrcDirPath({ projectDirPath });

-    for (const themeName of buildOptions.themeNames) {
+    for (const themeName of [buildOptions.themeName, ...buildOptions.extraThemeNames]) {
        await generateTheme({
-            themeName,
+            projectDirPath,
+            "keycloakThemeBuildingDirPath": buildOptions.keycloakifyBuildDirPath,
            themeSrcDirPath,
            "keycloakifySrcDirPath": pathJoin(keycloakifyDirPath, "src"),
-            buildOptions,
+            "reactAppBuildDirPath": buildOptions.reactAppBuildDirPath,
+            "buildOptions": {
+                ...buildOptions,
+                "themeName": themeName
+            },
            "keycloakifyVersion": (() => {
                const version = JSON.parse(fs.readFileSync(pathJoin(keycloakifyDirPath, "package.json")).toString("utf8"))["version"];

@ -42,7 +49,8 @@ export async function main() {
        });
    }

-    const { jarFilePath } = await generateJavaStackFiles({
+    const { jarFilePath } = generateJavaStackFiles({
+        "keycloakThemeBuildingDirPath": buildOptions.keycloakifyBuildDirPath,
        "implementedThemeTypes": (() => {
            const implementedThemeTypes = {
                "login": false,
@ -62,45 +70,43 @@ export async function main() {
        buildOptions
    });

-    if (buildOptions.doCreateJar) {
-        child_process.execSync("mvn clean install", { "cwd": buildOptions.keycloakifyBuildDirPath });
-
-        const jarDirPath = pathDirname(jarFilePath);
-        const retrocompatJarFilePath = pathJoin(jarDirPath, "retrocompat-" + pathBasename(jarFilePath));
-
-        fs.renameSync(pathJoin(jarDirPath, "original-" + pathBasename(jarFilePath)), retrocompatJarFilePath);
-
-        fs.writeFileSync(
-            pathJoin(jarDirPath, "README.md"),
-            Buffer.from(
-                [
-                    `- The ${jarFilePath} is to be used in Keycloak 23 and up.  `,
-                    `- The ${retrocompatJarFilePath} is to be used in Keycloak 22 and below.`,
-                    `  Note that Keycloak 22 is only supported for login and email theme but not for account themes.  `
-                ].join("\n"),
-                "utf8"
-            )
-        );
+    switch (buildOptions.bundler) {
+        case "none":
+            logger.log("😱 Skipping bundling step, there will be no jar");
+            break;
+        case "keycloakify":
+            logger.log("🫶 Let keycloakify do its thang");
+            await jar({
+                "rootPath": buildOptions.keycloakifyBuildDirPath,
+                "version": buildOptions.themeVersion,
+                "groupId": buildOptions.groupId,
+                "artifactId": buildOptions.artifactId,
+                "targetPath": jarFilePath
+            });
+            break;
+        case "mvn":
+            logger.log("🫙 Run maven to deliver a jar");
+            child_process.execSync("mvn package", { "cwd": buildOptions.keycloakifyBuildDirPath });
+            break;
+        default:
+            assert<Equals<typeof buildOptions.bundler, never>>(false);
    }

-    const containerKeycloakVersion = "23.0.0";
+    // We want, however, to test in a container running the latest Keycloak version
+    const containerKeycloakVersion = "21.1.2";

    generateStartKeycloakTestingContainer({
+        keycloakThemeBuildingDirPath: buildOptions.keycloakifyBuildDirPath,
        "keycloakVersion": containerKeycloakVersion,
-        jarFilePath,
        buildOptions
    });

    logger.log(
        [
            "",
-            ...(!buildOptions.doCreateJar
-                ? []
-                : [
-                      `✅ Your keycloak theme has been generated and bundled into .${pathSep}${pathRelative(reactAppRootDirPath, jarFilePath)} 🚀`,
-                      `It is to be placed in "/opt/keycloak/providers" in the container running a quay.io/keycloak/keycloak Docker image.`,
-                      ""
-                  ]),
+            `✅ Your keycloak theme has been generated and bundled into .${pathSep}${pathRelative(projectDirPath, jarFilePath)} 🚀`,
+            `It is to be placed in "/opt/keycloak/providers" in the container running a quay.io/keycloak/keycloak Docker image.`,
+            "",
            //TODO: Restore when we find a good Helm chart for Keycloak.
            //"Using Helm (https://github.com/codecentric/helm-charts), edit to reflect:",
            "",
@ -133,7 +139,7 @@ export async function main() {
            `To test your theme locally you can spin up a Keycloak ${containerKeycloakVersion} container image with the theme pre loaded by running:`,
            "",
            `👉 $ .${pathSep}${pathRelative(
-                reactAppRootDirPath,
+                projectDirPath,
                pathJoin(buildOptions.keycloakifyBuildDirPath, generateStartKeycloakTestingContainer.basename)
            )} 👈`,
            "",
@ -143,15 +149,15 @@ export async function main() {
            "- Log into the admin console 👉 http://localhost:8080/admin username: admin, password: admin 👈",
            `- Create a realm:                       Master         -> AddRealm   -> Name: myrealm`,
            `- Enable registration:                  Realm settings -> Login tab  -> User registration: on`,
-            `- Enable the Account theme (optional):  Realm settings -> Themes tab -> Account theme: ${buildOptions.themeNames[0]}`,
-            `                                        Clients        -> account    -> Login theme:   ${buildOptions.themeNames[0]}`,
-            `- Enable the email theme (optional):    Realm settings -> Themes tab -> Email theme:   ${buildOptions.themeNames[0]} (option will appear only if you have ran npx initialize-email-theme)`,
+            `- Enable the Account theme (optional):  Realm settings -> Themes tab -> Account theme: ${buildOptions.themeName}`,
+            `                                        Clients        -> account    -> Login theme:   ${buildOptions.themeName}`,
+            `- Enable the email theme (optional):    Realm settings -> Themes tab -> Email theme:   ${buildOptions.themeName} (option will appear only if you have ran npx initialize-email-theme)`,
            `- Create a client                       Clients        -> Create     -> Client ID:                       myclient`,
            `                                                                        Root URL:                        https://www.keycloak.org/app/`,
            `                                                                        Valid redirect URIs:             https://www.keycloak.org/app* http://localhost* (localhost is optional)`,
            `                                                                        Valid post logout redirect URIs: https://www.keycloak.org/app* http://localhost*`,
            `                                                                        Web origins:                     *`,
-            `                                                                        Login Theme:                     ${buildOptions.themeNames[0]}`,
+            `                                                                        Login Theme:                     ${buildOptions.themeName}`,
            `                                                                        Save (button at the bottom of the page)`,
            ``,
            `- Go to  👉  https://www.keycloak.org/app/ 👈 Click "Save" then "Sign in". You should see your login page`,
--- a/src/bin/keycloakify/parsedPackageJson.ts
+++ b/src/bin/keycloakify/parsedPackageJson.ts
@ -4,6 +4,8 @@ import type { Equals } from "tsafe";
 import { z } from "zod";
 import { pathJoin } from "../tools/pathJoin";

+export const bundlers = ["mvn", "keycloakify", "none"] as const;
+export type Bundler = (typeof bundlers)[number];
 export type ParsedPackageJson = {
    name: string;
    version?: string;
@ -13,12 +15,12 @@ export type ParsedPackageJson = {
        areAppAndKeycloakServerSharingSameDomain?: boolean;
        artifactId?: string;
        groupId?: string;
-        doCreateJar?: boolean;
-        loginThemeResourcesFromKeycloakVersion?: string;
+        bundler?: Bundler;
+        keycloakVersionDefaultAssets?: string;
        reactAppBuildDirPath?: string;
        keycloakifyBuildDirPath?: string;
-        themeName?: string | string[];
-        doBuildRetrocompatAccountTheme?: boolean;
+        themeName?: string;
+        extraThemeNames?: string[];
    };
 };

@ -32,12 +34,12 @@ export const zParsedPackageJson = z.object({
            "areAppAndKeycloakServerSharingSameDomain": z.boolean().optional(),
            "artifactId": z.string().optional(),
            "groupId": z.string().optional(),
-            "doCreateJar": z.boolean().optional(),
-            "loginThemeResourcesFromKeycloakVersion": z.string().optional(),
+            "bundler": z.enum(bundlers).optional(),
+            "keycloakVersionDefaultAssets": z.string().optional(),
            "reactAppBuildDirPath": z.string().optional(),
            "keycloakifyBuildDirPath": z.string().optional(),
-            "themeName": z.union([z.string(), z.array(z.string())]).optional(),
-            "doBuildRetrocompatAccountTheme": z.boolean().optional()
+            "themeName": z.string().optional(),
+            "extraThemeNames": z.array(z.string()).optional()
        })
        .optional()
 });
@ -45,11 +47,11 @@ export const zParsedPackageJson = z.object({
 assert<Equals<ReturnType<(typeof zParsedPackageJson)["parse"]>, ParsedPackageJson>>();

 let parsedPackageJson: undefined | ReturnType<(typeof zParsedPackageJson)["parse"]>;
-export function getParsedPackageJson(params: { reactAppRootDirPath: string }) {
-    const { reactAppRootDirPath } = params;
+export function getParsedPackageJson(params: { projectDirPath: string }) {
+    const { projectDirPath } = params;
    if (parsedPackageJson) {
        return parsedPackageJson;
    }
-    parsedPackageJson = zParsedPackageJson.parse(JSON.parse(fs.readFileSync(pathJoin(reactAppRootDirPath, "package.json")).toString("utf8")));
+    parsedPackageJson = zParsedPackageJson.parse(JSON.parse(fs.readFileSync(pathJoin(projectDirPath, "package.json")).toString("utf8")));
    return parsedPackageJson;
 }
--- a/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts
+++ b/src/bin/keycloakify/replacers/replaceImportsInCssCode.ts
@ -16,7 +16,7 @@ export function replaceImportsInCssCode(params: { cssCode: string }): {

    const cssGlobalsToDefine: Record<string, string> = {};

-    new Set(cssCode.match(/url\(["']?\/[^/][^)"']+["']?\)[^;}]*?/g) ?? []).forEach(
+    new Set(cssCode.match(/url\(["']?\/[^/][^)"']+["']?\)[^;}]*/g) ?? []).forEach(
        match => (cssGlobalsToDefine["url" + crypto.createHash("sha256").update(match).digest("hex").substring(0, 15)] = match)
    );

--- a/src/bin/mockTestingResourcesPath.ts
+++ b/src/bin/mockTestingResourcesPath.ts
@ -0,0 +1,5 @@
+import { pathJoin } from "./tools/pathJoin";
+
+export const basenameOfKeycloakDirInPublicDir = "keycloak-resources";
+export const resourcesDirPathRelativeToPublicDir = pathJoin(basenameOfKeycloakDirInPublicDir, "resources");
+export const resourcesCommonDirPathRelativeToPublicDir = pathJoin(resourcesDirPathRelativeToPublicDir, "resources_common");
--- a/src/bin/promptKeycloakVersion.ts
+++ b/src/bin/promptKeycloakVersion.ts
@ -1,7 +1,6 @@
 import { getLatestsSemVersionedTagFactory } from "./tools/octokit-addons/getLatestsSemVersionedTag";
 import { Octokit } from "@octokit/rest";
 import cliSelect from "cli-select";
-import { lastKeycloakVersionWithAccountV1 } from "./constants";

 export async function promptKeycloakVersion() {
    const { getLatestsSemVersionedTag } = (() => {
@ -27,7 +26,6 @@ export async function promptKeycloakVersion() {
            "owner": "keycloak",
            "repo": "keycloak"
        }).then(arr => arr.map(({ tag }) => tag))),
-        lastKeycloakVersionWithAccountV1,
        "11.0.3"
    ];

--- a/src/bin/tools/downloadAndUnzip.ts
+++ b/src/bin/tools/downloadAndUnzip.ts
@ -162,7 +162,7 @@ export async function downloadAndUnzip(
    } & (
        | {
              doUseCache: true;
-              cacheDirPath: string;
+              projectDirPath: string;
          }
        | {
              doUseCache: false;
@ -182,10 +182,11 @@ export async function downloadAndUnzip(
                  }
    });

-    const cacheDirPath = !rest.doUseCache ? `tmp_${Math.random().toString().slice(2, 12)}` : rest.cacheDirPath;
-
-    const zipFilePath = pathJoin(cacheDirPath, `${zipFileBasename}.zip`);
-    const extractDirPath = pathJoin(cacheDirPath, `tmp_unzip_${zipFileBasename}`);
+    const cacheRoot = !rest.doUseCache
+        ? `tmp_${Math.random().toString().slice(2, 12)}`
+        : pathJoin(process.env.XDG_CACHE_HOME ?? pathJoin(rest.projectDirPath, "node_modules", ".cache"), "keycloakify");
+    const zipFilePath = pathJoin(cacheRoot, `${zipFileBasename}.zip`);
+    const extractDirPath = pathJoin(cacheRoot, `tmp_unzip_${zipFileBasename}`);

    if (!(await exists(zipFilePath))) {
        const opts = await getFetchOptions();
@ -225,7 +226,7 @@ export async function downloadAndUnzip(
    });

    if (!rest.doUseCache) {
-        await rm(cacheDirPath, { "recursive": true });
+        await rm(cacheRoot, { "recursive": true });
    } else {
        await rm(extractDirPath, { "recursive": true });
    }
--- a/src/bin/tools/getAbsoluteAndInOsFormatPath.ts
+++ b/src/bin/tools/getAbsoluteAndInOsFormatPath.ts
@ -1,15 +0,0 @@
-import { isAbsolute as pathIsAbsolute, sep as pathSep, join as pathJoin } from "path";
-
-export function getAbsoluteAndInOsFormatPath(params: { pathIsh: string; cwd: string }): string {
-    const { pathIsh, cwd } = params;
-
-    let pathOut = pathIsh;
-
-    pathOut = pathOut.replace(/\//g, pathSep);
-
-    if (!pathIsAbsolute(pathOut)) {
-        pathOut = pathJoin(cwd, pathOut);
-    }
-
-    return pathOut;
-}
--- a/src/bin/tools/jar.ts
+++ b/src/bin/tools/jar.ts
@ -0,0 +1,99 @@
+import { dirname, relative, sep, join } from "path";
+import { createWriteStream } from "fs";
+
+import walk from "./walk";
+import { ZipFile } from "yazl";
+import { mkdir } from "fs/promises";
+import trimIndent from "./trimIndent";
+
+export type ZipEntry = { zipPath: string } & ({ fsPath: string } | { buffer: Buffer });
+export type ZipEntryGenerator = AsyncGenerator<ZipEntry, void, unknown>;
+
+type CommonJarArgs = {
+    groupId: string;
+    artifactId: string;
+    version: string;
+};
+
+export type JarStreamArgs = CommonJarArgs & {
+    asyncPathGeneratorFn(): ZipEntryGenerator;
+};
+
+export type JarArgs = CommonJarArgs & {
+    targetPath: string;
+    rootPath: string;
+};
+
+export async function jarStream({ groupId, artifactId, version, asyncPathGeneratorFn }: JarStreamArgs) {
+    const manifestPath = "META-INF/MANIFEST.MF";
+    const manifestData = Buffer.from(trimIndent`
+            Manifest-Version: 1.0
+            Archiver-Version: Plexus Archiver
+            Created-By: Keycloakify
+            Built-By: unknown
+            Build-Jdk: 19.0.0
+            `);
+
+    const pomPropsPath = `META-INF/maven/${groupId}/${artifactId}/pom.properties`;
+    const pomPropsData = Buffer.from(trimIndent`
+            # Generated by keycloakify
+            # ${new Date()}
+            artifactId=${artifactId}
+            groupId=${groupId}
+            version=${version}
+            `);
+
+    const zipFile = new ZipFile();
+
+    for await (const entry of asyncPathGeneratorFn()) {
+        if ("buffer" in entry) {
+            zipFile.addBuffer(entry.buffer, entry.zipPath);
+        } else if ("fsPath" in entry) {
+            if (entry.fsPath.endsWith(sep)) {
+                zipFile.addEmptyDirectory(entry.zipPath);
+            } else {
+                zipFile.addFile(entry.fsPath, entry.zipPath);
+            }
+        }
+    }
+
+    zipFile.addBuffer(manifestData, manifestPath);
+    zipFile.addBuffer(pomPropsData, pomPropsPath);
+
+    zipFile.end();
+
+    return zipFile;
+}
+
+/**
+ * Create a jar archive, using the resources found at `rootPath` (a directory) and write the
+ * archive to `targetPath` (a file). Use `groupId`, `artifactId` and `version` to define
+ * the contents of the pom.properties file which is going to be added to the archive.
+ * The root directory is expectedto have a conventional maven/gradle folder structure with a
+ * single `pom.xml` file at the root and a `src/main/resources` directory containing all
+ * application resources.
+ */
+export default async function jar({ groupId, artifactId, version, rootPath, targetPath }: JarArgs) {
+    await mkdir(dirname(targetPath), { recursive: true });
+
+    const asyncPathGeneratorFn = async function* (): ZipEntryGenerator {
+        const resourcesPath = join(rootPath, "src", "main", "resources");
+        for await (const fsPath of walk(resourcesPath)) {
+            const zipPath = relative(resourcesPath, fsPath).split(sep).join("/");
+            yield { fsPath, zipPath };
+        }
+        yield {
+            fsPath: join(rootPath, "pom.xml"),
+            zipPath: `META-INF/maven/${groupId}/${artifactId}/pom.xml`
+        };
+    };
+
+    const zipFile = await jarStream({ groupId, artifactId, version, asyncPathGeneratorFn });
+
+    await new Promise<void>(async (resolve, reject) => {
+        zipFile.outputStream
+            .pipe(createWriteStream(targetPath, { encoding: "binary" }))
+            .on("close", () => resolve())
+            .on("error", e => reject(e));
+    });
+}
--- a/src/bin/tools/pathJoin.ts
+++ b/src/bin/tools/pathJoin.ts
@ -2,5 +2,5 @@ export function pathJoin(...path: string[]): string {
    return path
        .map((part, i) => (i === 0 ? part : part.replace(/^\/+/, "")))
        .map((part, i) => (i === path.length - 1 ? part : part.replace(/\/+$/, "")))
-        .join(typeof process !== "undefined" && process.platform === "win32" ? "\\" : "/");
+        .join("/");
 }
--- a/src/bin/tools/walk.ts
+++ b/src/bin/tools/walk.ts
@ -0,0 +1,19 @@
+import { readdir } from "fs/promises";
+import { resolve, sep } from "path";
+
+/**
+ * Asynchronously and recursively walk a directory tree, yielding every file and directory
+ * found. Directory paths will _always_ end with a path separator.
+ *
+ * @param root the starting directory
+ * @returns AsyncGenerator
+ */
+export default async function* walk(root: string): AsyncGenerator<string, void, unknown> {
+    for (const entry of await readdir(root, { withFileTypes: true })) {
+        const absolutePath = resolve(root, entry.name);
+        if (entry.isDirectory()) {
+            yield absolutePath.endsWith(sep) ? absolutePath : absolutePath + sep;
+            yield* walk(absolutePath);
+        } else yield absolutePath.endsWith(sep) ? absolutePath.substring(0, absolutePath.length - 1) : absolutePath;
+    }
+}
--- a/src/login/Template.tsx
+++ b/src/login/Template.tsx
@ -45,8 +45,6 @@ export default function Template(props: TemplateProps<KcContext, I18n>) {
        return null;
    }

-    document.title = i18n.msgStr("loginTitle", kcContext.realm.displayName);
-
    return (
        <div className={getClassName("kcLoginClass")}>
            <div id="kc-header" className={getClassName("kcHeaderClass")}>
--- a/src/login/TemplateProps.ts
+++ b/src/login/TemplateProps.ts
@ -95,5 +95,4 @@ export type ClassKey =
    | "kcAuthenticatorOtpCircleClass"
    | "kcSelectOTPItemHeadingClass"
    | "kcFormOptionsWrapperClass"
-    | "kcFormButtonsWrapperClass"
-    | "kcInputGroup";
+    | "kcFormButtonsWrapperClass";
--- a/src/login/kcContext/KcContext.ts
+++ b/src/login/kcContext/KcContext.ts
@ -1,5 +1,4 @@
-import type { LoginThemePageId } from "keycloakify/bin/keycloakify/generateFtl";
-import { type ThemeType } from "keycloakify/bin/constants";
+import type { LoginThemePageId, ThemeType } from "keycloakify/bin/keycloakify/generateFtl";
 import { assert } from "tsafe/assert";
 import type { Equals } from "tsafe";
 import type { MessageKey } from "../i18n/i18n";
@ -82,7 +81,6 @@ export declare namespace KcContext {
            clientId: string;
            name?: string;
            description?: string;
-            attributes: Record<string, string>;
        };
        isAppInitiatedAction: boolean;
        messagesPerField: {
--- a/src/login/kcContext/createGetKcContext.ts
+++ b/src/login/kcContext/createGetKcContext.ts
@ -8,8 +8,9 @@ import { assert } from "tsafe/assert";
 import type { ExtendKcContext } from "./getKcContextFromWindow";
 import { getKcContextFromWindow } from "./getKcContextFromWindow";
 import { pathJoin } from "keycloakify/bin/tools/pathJoin";
+import { pathBasename } from "keycloakify/tools/pathBasename";
+import { resourcesCommonDirPathRelativeToPublicDir } from "keycloakify/bin/mockTestingResourcesPath";
 import { symToStr } from "tsafe/symToStr";
-import { resources_common } from "keycloakify/bin/constants";

 export function createGetKcContext<KcContextExtension extends { pageId: string } = never>(params?: {
    mockData?: readonly DeepPartial<ExtendKcContext<KcContextExtension>>[];
@ -147,7 +148,11 @@ export function createGetKcContext<KcContextExtension extends { pageId: string }
            return { "kcContext": undefined as any };
        }

-        realKcContext.url.resourcesCommonPath = pathJoin(realKcContext.url.resourcesPath, resources_common);
+        {
+            const { url } = realKcContext;
+
+            url.resourcesCommonPath = pathJoin(url.resourcesPath, pathBasename(resourcesCommonDirPathRelativeToPublicDir));
+        }

        return { "kcContext": realKcContext as any };
    }
--- a/src/login/kcContext/kcContextMocks.ts
+++ b/src/login/kcContext/kcContextMocks.ts
@ -1,11 +1,13 @@
 import "minimal-polyfills/Object.fromEntries";
 import type { KcContext, Attribute } from "./KcContext";
-import { resources_common, keycloak_resources } from "keycloakify/bin/constants";
+import { resourcesCommonDirPathRelativeToPublicDir, resourcesDirPathRelativeToPublicDir } from "keycloakify/bin/mockTestingResourcesPath";
 import { pathJoin } from "keycloakify/bin/tools/pathJoin";
 import { id } from "tsafe/id";
 import { assert, type Equals } from "tsafe/assert";
 import type { LoginThemePageId } from "keycloakify/bin/keycloakify/generateFtl";

+const PUBLIC_URL = (typeof process !== "object" ? undefined : process.env?.["PUBLIC_URL"]) || "/";
+
 const attributes: Attribute[] = [
    {
        "validators": {
@ -100,10 +102,6 @@ const attributes: Attribute[] = [

 const attributesByName = Object.fromEntries(attributes.map(attribute => [attribute.name, attribute])) as any;

-const PUBLIC_URL = (typeof process !== "object" ? undefined : process.env?.["PUBLIC_URL"]) || "/";
-
-const resourcesPath = pathJoin(PUBLIC_URL, keycloak_resources, "login", "resources");
-
 export const kcContextCommonMock: KcContext.Common = {
    "themeVersion": "0.0.0",
    "keycloakifyVersion": "0.0.0",
@ -111,8 +109,8 @@ export const kcContextCommonMock: KcContext.Common = {
    "themeName": "my-theme-name",
    "url": {
        "loginAction": "#",
-        resourcesPath,
-        "resourcesCommonPath": pathJoin(resourcesPath, resources_common),
+        "resourcesPath": pathJoin(PUBLIC_URL, resourcesDirPathRelativeToPublicDir),
+        "resourcesCommonPath": pathJoin(PUBLIC_URL, resourcesCommonDirPathRelativeToPublicDir),
        "loginRestartFlowUrl": "/auth/realms/myrealm/login-actions/restart?client_id=account&tab_id=HoAx28ja4xg",
        "loginUrl": "/auth/realms/myrealm/login-actions/authenticate?client_id=account&tab_id=HoAx28ja4xg"
    },
@ -234,8 +232,7 @@ export const kcContextCommonMock: KcContext.Common = {
        "showTryAnotherWayLink": false
    },
    "client": {
-        "clientId": "myApp",
-        "attributes": {}
+        "clientId": "myApp"
    },
    "scripts": [],
    "isAppInitiatedAction": false
@ -315,8 +312,7 @@ export const kcContextMocks = [
        "actionUri": "#",
        "client": {
            "clientId": "myApp",
-            "baseUrl": "#",
-            "attributes": {}
+            "baseUrl": "#"
        }
    }),
    id<KcContext.Error>({
@ -324,8 +320,7 @@ export const kcContextMocks = [
        "pageId": "error.ftl",
        "client": {
            "clientId": "myApp",
-            "baseUrl": "#",
-            "attributes": {}
+            "baseUrl": "#"
        },
        "message": {
            "type": "error",
@ -499,8 +494,7 @@ export const kcContextMocks = [
        },
        "client": {
            "clientId": "myApp",
-            "baseUrl": "#",
-            "attributes": {}
+            "baseUrl": "#"
        },
        "logoutConfirm": { "code": "123", skipLink: false }
    }),
--- a/src/login/lib/useGetClassName.ts
+++ b/src/login/lib/useGetClassName.ts
@ -67,7 +67,6 @@ export const { useGetClassName } = createUseClassName<ClassKey>({

        // css classes for input
        "kcInputLargeClass": "input-lg",
-        "kcInputGroup": "pf-c-input-group",

        // css classes for form accessability
        "kcSrOnlyClass": "sr-only",
@ -94,7 +93,7 @@ export const { useGetClassName } = createUseClassName<ClassKey>({
        "kcAuthenticatorWebAuthnPasswordlessClass": "fa fa-key list-view-pf-icon-lg",

        //css classes for the OTP Login Form
-        "kcSelectOTPListClass": "card-pf card-pf-view card-pf-view-select card-pf-view-single-select col-xs-12",
+        "kcSelectOTPListClass": "card-pf card-pf-view card-pf-view-select card-pf-view-single-select",
        "kcSelectOTPListItemClass": "card-pf-body card-pf-top-element",
        "kcAuthenticatorOtpCircleClass": "fa fa-mobile card-pf-icon-circle",
        "kcSelectOTPItemHeadingClass": "card-pf-title text-center",
--- a/src/login/pages/Login.tsx
+++ b/src/login/pages/Login.tsx
@ -37,18 +37,22 @@ export default function Login(props: PageProps<Extract<KcContext, { pageId: "log
    return (
        <Template
            {...{ kcContext, i18n, doUseDefaultCss, classes }}
-            displayInfo={realm.password && realm.registrationAllowed && !registrationDisabled}
+            displayInfo={social.displayInfo}
            displayWide={realm.password && social.providers !== undefined}
            headerNode={msg("doLogIn")}
            infoNode={
-                <div id="kc-registration">
-                    <span>
-                        {msg("noAccount")}
-                        <a tabIndex={6} href={url.registrationUrl}>
-                            {msg("doRegister")}
-                        </a>
-                    </span>
-                </div>
+                realm.password &&
+                realm.registrationAllowed &&
+                !registrationDisabled && (
+                    <div id="kc-registration">
+                        <span>
+                            {msg("noAccount")}
+                            <a tabIndex={6} href={url.registrationUrl}>
+                                {msg("doRegister")}
+                            </a>
+                        </span>
+                    </div>
+                )
            }
        >
            <div id="kc-form" className={clsx(realm.password && social.providers !== undefined && getClassName("kcContentWrapperClass"))}>
--- a/src/login/pages/LoginDeviceVerifyUserCode.tsx
+++ b/src/login/pages/LoginDeviceVerifyUserCode.tsx
@ -1,11 +1,12 @@
 import { clsx } from "keycloakify/tools/clsx";
+import Template from "../Template";
 import { I18n } from "../i18n";
 import { KcContext } from "../kcContext";
-import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
+import { useGetClassName } from "../lib/useGetClassName";
 import { PageProps } from "./PageProps";

 export default function LoginOauthGrant(props: PageProps<Extract<KcContext, { pageId: "login-oauth2-device-verify-user-code.ftl" }>, I18n>) {
-    const { kcContext, i18n, doUseDefaultCss, classes, Template } = props;
+    const { kcContext, i18n, doUseDefaultCss, classes } = props;
    const { url } = kcContext;

    const { msg, msgStr } = i18n;
--- a/src/login/pages/LoginOauthGrant.tsx
+++ b/src/login/pages/LoginOauthGrant.tsx
@ -2,10 +2,11 @@ import { clsx } from "keycloakify/tools/clsx";
 import { PageProps } from "./PageProps";
 import { KcContext } from "../kcContext";
 import { I18n } from "../i18n";
+import Template from "../Template";
 import { useGetClassName } from "keycloakify/login/lib/useGetClassName";

 export default function LoginOauthGrant(props: PageProps<Extract<KcContext, { pageId: "login-oauth-grant.ftl" }>, I18n>) {
-    const { kcContext, i18n, doUseDefaultCss, classes, Template } = props;
+    const { kcContext, i18n, doUseDefaultCss, classes } = props;
    const { url, oauth, client } = kcContext;

    const { msg, msgStr, advancedMsg, advancedMsgStr } = i18n;
--- a/src/login/pages/LoginOtp.tsx
+++ b/src/login/pages/LoginOtp.tsx
@ -1,3 +1,5 @@
+import { useEffect } from "react";
+import { headInsert } from "keycloakify/tools/headInsert";
 import { clsx } from "keycloakify/tools/clsx";
 import type { PageProps } from "keycloakify/login/pages/PageProps";
 import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
@ -16,77 +18,105 @@ export default function LoginOtp(props: PageProps<Extract<KcContext, { pageId: "

    const { msg, msgStr } = i18n;

+    useEffect(() => {
+        let isCleanedUp = false;
+
+        const { prLoaded, remove } = headInsert({
+            "type": "javascript",
+            "src": `${kcContext.url.resourcesCommonPath}/node_modules/jquery/dist/jquery.min.js`
+        });
+
+        (async () => {
+            await prLoaded;
+
+            if (isCleanedUp) {
+                return;
+            }
+
+            evaluateInlineScript();
+        })();
+
+        return () => {
+            isCleanedUp = true;
+            remove();
+        };
+    }, []);
+
    return (
-        <>
-            <style>
-                {`
-                input[type="radio"]:checked~label.kcSelectOTPListClass{
-                    border: 2px solid #39a5dc;
-                }`}
-            </style>
-            <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} headerNode={msg("doLogIn")}>
-                <form id="kc-otp-login-form" className={getClassName("kcFormClass")} action={url.loginAction} method="post">
-                    {otpLogin.userOtpCredentials.length > 1 && (
-                        <div className={getClassName("kcFormGroupClass")}>
-                            <div className={getClassName("kcInputWrapperClass")}>
-                                {otpLogin.userOtpCredentials.map((otpCredential, index) => (
-                                    <div key={otpCredential.id}>
-                                        <input
-                                            id={`kc-otp-credential-${index}`}
-                                            name="selectedCredentialId"
-                                            type="radio"
-                                            value={otpCredential.id}
-                                            style={{ display: "none" }}
-                                        />
-                                        <label
-                                            htmlFor={`kc-otp-credential-${index}`}
-                                            key={otpCredential.id}
-                                            className={getClassName("kcSelectOTPListClass")}
-                                        >
-                                            <div className={getClassName("kcSelectOTPListItemClass")}>
-                                                <span className={getClassName("kcAuthenticatorOtpCircleClass")} />
-                                                <h2 className={getClassName("kcSelectOTPItemHeadingClass")}>{otpCredential.userLabel}</h2>
-                                            </div>
-                                        </label>
-                                    </div>
-                                ))}
-                            </div>
-                        </div>
-                    )}
+        <Template {...{ kcContext, i18n, doUseDefaultCss, classes }} headerNode={msg("doLogIn")}>
+            <form id="kc-otp-login-form" className={getClassName("kcFormClass")} action={url.loginAction} method="post">
+                {otpLogin.userOtpCredentials.length > 1 && (
                    <div className={getClassName("kcFormGroupClass")}>
-                        <div className={getClassName("kcLabelWrapperClass")}>
-                            <label htmlFor="otp" className={getClassName("kcLabelClass")}>
-                                {msg("loginOtpOneTime")}
-                            </label>
-                        </div>
-
                        <div className={getClassName("kcInputWrapperClass")}>
-                            <input id="otp" name="otp" autoComplete="off" type="text" className={getClassName("kcInputClass")} autoFocus />
+                            {otpLogin.userOtpCredentials.map(otpCredential => (
+                                <div key={otpCredential.id} className={getClassName("kcSelectOTPListClass")}>
+                                    <input type="hidden" value="${otpCredential.id}" />
+                                    <div className={getClassName("kcSelectOTPListItemClass")}>
+                                        <span className={getClassName("kcAuthenticatorOtpCircleClass")} />
+                                        <h2 className={getClassName("kcSelectOTPItemHeadingClass")}>{otpCredential.userLabel}</h2>
+                                    </div>
+                                </div>
+                            ))}
                        </div>
                    </div>
-
-                    <div className={getClassName("kcFormGroupClass")}>
-                        <div id="kc-form-options" className={getClassName("kcFormOptionsClass")}>
-                            <div className={getClassName("kcFormOptionsWrapperClass")} />
-                        </div>
-
-                        <div id="kc-form-buttons" className={getClassName("kcFormButtonsClass")}>
-                            <input
-                                className={clsx(
-                                    getClassName("kcButtonClass"),
-                                    getClassName("kcButtonPrimaryClass"),
-                                    getClassName("kcButtonBlockClass"),
-                                    getClassName("kcButtonLargeClass")
-                                )}
-                                name="login"
-                                id="kc-login"
-                                type="submit"
-                                value={msgStr("doLogIn")}
-                            />
-                        </div>
+                )}
+                <div className={getClassName("kcFormGroupClass")}>
+                    <div className={getClassName("kcLabelWrapperClass")}>
+                        <label htmlFor="otp" className={getClassName("kcLabelClass")}>
+                            {msg("loginOtpOneTime")}
+                        </label>
                    </div>
-                </form>
-            </Template>
-        </>
+
+                    <div className={getClassName("kcInputWrapperClass")}>
+                        <input id="otp" name="otp" autoComplete="off" type="text" className={getClassName("kcInputClass")} autoFocus />
+                    </div>
+                </div>
+
+                <div className={getClassName("kcFormGroupClass")}>
+                    <div id="kc-form-options" className={getClassName("kcFormOptionsClass")}>
+                        <div className={getClassName("kcFormOptionsWrapperClass")} />
+                    </div>
+
+                    <div id="kc-form-buttons" className={getClassName("kcFormButtonsClass")}>
+                        <input
+                            className={clsx(
+                                getClassName("kcButtonClass"),
+                                getClassName("kcButtonPrimaryClass"),
+                                getClassName("kcButtonBlockClass"),
+                                getClassName("kcButtonLargeClass")
+                            )}
+                            name="login"
+                            id="kc-login"
+                            type="submit"
+                            value={msgStr("doLogIn")}
+                        />
+                    </div>
+                </div>
+            </form>
+        </Template>
    );
 }
+
+declare const $: any;
+
+function evaluateInlineScript() {
+    $(document).ready(function () {
+        // Card Single Select
+        $(".card-pf-view-single-select").click(function (this: any) {
+            if ($(this).hasClass("active")) {
+                $(this).removeClass("active");
+                $(this).children().removeAttr("name");
+            } else {
+                $(".card-pf-view-single-select").removeClass("active");
+                $(".card-pf-view-single-select").children().removeAttr("name");
+                $(this).addClass("active");
+                $(this).children().attr("name", "selectedCredentialId");
+            }
+        });
+
+        var defaultCred = $(".card-pf-view-single-select")[0];
+        if (defaultCred) {
+            defaultCred.click();
+        }
+    });
+}
--- a/src/login/pages/PageProps.ts
+++ b/src/login/pages/PageProps.ts
@ -1,9 +1,9 @@
+import type { LazyExoticComponent } from "react";
 import type { I18n } from "keycloakify/login/i18n";
 import { type TemplateProps, type ClassKey } from "keycloakify/login/TemplateProps";
-import type { LazyOrNot } from "keycloakify/tools/LazyOrNot";

 export type PageProps<KcContext, I18nExtended extends I18n> = {
-    Template: LazyOrNot<(props: TemplateProps<any, any>) => JSX.Element | null>;
+    Template: LazyExoticComponent<(props: TemplateProps<any, any>) => JSX.Element | null>;
    kcContext: KcContext;
    i18n: I18nExtended;
    doUseDefaultCss: boolean;
--- a/src/tools/LazyOrNot.ts
+++ b/src/tools/LazyOrNot.ts
@ -1,3 +0,0 @@
-import type { LazyExoticComponent, ComponentType } from "react";
-
-export type LazyOrNot<Component extends ComponentType<any>> = LazyExoticComponent<Component> | Component;
--- a/test/bin/jar.spec.ts
+++ b/test/bin/jar.spec.ts
@ -0,0 +1,131 @@
+import jar, { jarStream, type ZipEntryGenerator } from "keycloakify/bin/tools/jar";
+import { fromBuffer, Entry, ZipFile } from "yauzl";
+import { it, describe, assert, afterAll } from "vitest";
+import { Readable } from "stream";
+import { tmpdir } from "os";
+import { mkdtemp, cp, mkdir, rm, writeFile } from "fs/promises";
+import path from "path";
+import { createReadStream } from "fs";
+import walk from "keycloakify/bin/tools/walk";
+
+type AsyncIterable<T> = {
+    [Symbol.asyncIterator](): AsyncIterableIterator<T>;
+};
+
+async function arrayFromAsync<T>(asyncIterable: AsyncIterable<T>) {
+    const chunks: T[] = [];
+    for await (const chunk of asyncIterable) chunks.push(chunk);
+    return chunks;
+}
+
+async function readToBuffer(stream: NodeJS.ReadableStream) {
+    return Buffer.concat(await arrayFromAsync(stream as AsyncIterable<Buffer>));
+}
+
+function unzipBuffer(buffer: Buffer) {
+    return new Promise<ZipFile>((resolve, reject) =>
+        fromBuffer(buffer, { lazyEntries: true }, (err, zipFile) => {
+            if (err !== null) {
+                reject(err);
+            } else {
+                resolve(zipFile);
+            }
+        })
+    );
+}
+
+function readEntry(zipFile: ZipFile, entry: Entry): Promise<Readable> {
+    return new Promise<Readable>((resolve, reject) => {
+        zipFile.openReadStream(entry, (err, stream) => {
+            if (err !== null) {
+                reject(err);
+            } else {
+                resolve(stream);
+            }
+        });
+    });
+}
+
+function readAll(zipFile: ZipFile): Promise<Map<string, Buffer>> {
+    return new Promise<Map<string, Buffer>>((resolve, reject) => {
+        const entries1: Map<string, Buffer> = new Map();
+        zipFile.on("entry", async (entry: Entry) => {
+            const stream = await readEntry(zipFile, entry);
+            const buffer = await readToBuffer(stream);
+            entries1.set(entry.fileName, buffer);
+            zipFile.readEntry();
+        });
+        zipFile.on("end", () => resolve(entries1));
+        zipFile.on("error", e => reject(e));
+        zipFile.readEntry();
+    });
+}
+
+describe("jar", () => {
+    const coords = { artifactId: "someArtifactId", groupId: "someGroupId", version: "1.2.3" };
+
+    const tmpDirs: string[] = [];
+
+    afterAll(async () => {
+        await Promise.all(tmpDirs.map(dir => rm(dir, { force: true, recursive: true })));
+    });
+
+    it("creates jar artifacts without error", async () => {
+        async function* mockFiles(): ZipEntryGenerator {
+            yield { zipPath: "foo", buffer: Buffer.from("foo") };
+        }
+
+        const zipped = await jarStream({ ...coords, asyncPathGeneratorFn: mockFiles });
+        const buffered = await readToBuffer(zipped.outputStream);
+        const unzipped = await unzipBuffer(buffered);
+        const entries = await readAll(unzipped);
+
+        assert.equal(entries.size, 3);
+        assert.isOk(entries.has("foo"));
+        assert.isOk(entries.has("META-INF/MANIFEST.MF"));
+        assert.isOk(entries.has("META-INF/maven/someGroupId/someArtifactId/pom.properties"));
+
+        assert.equal("foo", entries.get("foo")?.toString("utf-8"));
+
+        const manifest = entries.get("META-INF/MANIFEST.MF")?.toString("utf-8");
+        const pomProperties = entries.get("META-INF/maven/someGroupId/someArtifactId/pom.properties")?.toString("utf-8");
+
+        assert.isOk(manifest?.includes("Created-By: Keycloakify"));
+        assert.isOk(pomProperties?.includes("1.2.3"));
+        assert.isOk(pomProperties?.includes("someGroupId"));
+        assert.isOk(pomProperties?.includes("someArtifactId"));
+    });
+
+    it("creates a jar from _real_ files without error", async () => {
+        const tmp = await mkdtemp(path.join(tmpdir(), "kc-jar-test-"));
+
+        tmpDirs.push(tmp);
+
+        const rootPath = path.join(tmp, "root");
+        const resourcesPath = path.join(tmp, "root", "src", "main", "resources");
+        const targetPath = path.join(tmp, "jar.jar");
+
+        await mkdir(resourcesPath, { recursive: true });
+        await writeFile(path.join(rootPath, "pom.xml"), "foo", "utf-8");
+
+        await cp(path.dirname(__dirname), resourcesPath, { recursive: true });
+
+        await jar({ ...coords, rootPath, targetPath });
+
+        const buffered = await readToBuffer(createReadStream(targetPath));
+        const unzipped = await unzipBuffer(buffered);
+        const entries = await readAll(unzipped);
+        const zipPaths = Array.from(entries.keys());
+
+        assert.isOk(entries.has("META-INF/MANIFEST.MF"));
+        assert.isOk(entries.has("META-INF/maven/someGroupId/someArtifactId/pom.properties"));
+        assert.isOk(entries.has("META-INF/maven/someGroupId/someArtifactId/pom.xml"));
+
+        for await (const fsPath of walk(resourcesPath)) {
+            if (!fsPath.endsWith(path.sep)) {
+                const rel = path.relative(resourcesPath, fsPath).replace(path.sep === "/" ? /\//g : /\\/g, "/");
+                assert.isOk(zipPaths.includes(rel), `missing '${rel}' (${rel}, '${zipPaths.join("', '")}')`);
+            }
+        }
+    });
+});
--- a/test/bin/readStaticResourcesUsage.spec.ts
+++ b/test/bin/readStaticResourcesUsage.spec.ts
@ -67,6 +67,9 @@ describe("Ensure it's able to extract used Keycloak resources", () => {
             `
        });

+        console.log(paths);
+        console.log(expectedPaths);
+
        expect(same(paths, expectedPaths)).toBe(true);
    });

--- a/test/bin/replaceImportFromStatic.spec.ts
+++ b/test/bin/replaceImportFromStatic.spec.ts
@ -124,7 +124,7 @@ describe("bin/css-transforms", () => {
                }
    
                .my-div2 {
-                    background: url(/logo192.png) repeat center center;
+                    background: url(/logo192.png) no-repeat center center;
                }
    
                .my-div {
@ -135,11 +135,11 @@ describe("bin/css-transforms", () => {

        const fixedCssCodeExpected = `
            .my-div {
-                background: var(--urla882a969fd39473) no-repeat center center;
+                background: var(--url1f9ef5a892c104c);
            }
    
            .my-div2 {
-                background: var(--urla882a969fd39473) repeat center center;
+                background: var(--url1f9ef5a892c104c);
            }
    
            .my-div {
@ -150,7 +150,7 @@ describe("bin/css-transforms", () => {
        expect(isSameCode(fixedCssCode, fixedCssCodeExpected)).toBe(true);

        const cssGlobalsToDefineExpected = {
-            "urla882a969fd39473": "url(/logo192.png)",
+            "url1f9ef5a892c104c": "url(/logo192.png) no-repeat center center",
            "urldd75cab58377c19": "url(/static/media/something.svg)"
        };

@ -165,7 +165,7 @@ describe("bin/css-transforms", () => {

        const cssCodeToPrependInHeadExpected = `
            :root {
-                --urla882a969fd39473: url(\${url.resourcesPath}/build/logo192.png);
+                --url1f9ef5a892c104c: url(\${url.resourcesPath}/build/logo192.png) no-repeat center center;
                --urldd75cab58377c19: url(\${url.resourcesPath}/build/static/media/something.svg);
            }
        `;
@ -191,11 +191,11 @@ describe("bin/css-transforms", () => {

        const fixedCssCodeExpected = `
            .my-div {
-                background: var(--url749a3139386b2c8) no-repeat center center;
+                background: var(--urlf8277cddaa2be78);
            }
    
            .my-div2 {
-                background: var(--url749a3139386b2c8) no-repeat center center;
+                background: var(--urlf8277cddaa2be78);
            }
    
            .my-div {
@ -206,7 +206,7 @@ describe("bin/css-transforms", () => {
        expect(isSameCode(fixedCssCode, fixedCssCodeExpected)).toBe(true);

        const cssGlobalsToDefineExpected = {
-            "url749a3139386b2c8": "url(/x/y/z/logo192.png)",
+            "urlf8277cddaa2be78": "url(/x/y/z/logo192.png) no-repeat center center",
            "url8bdc0887b97ac9a": "url(/x/y/z/static/media/something.svg)"
        };

@ -221,7 +221,7 @@ describe("bin/css-transforms", () => {

        const cssCodeToPrependInHeadExpected = `
            :root {
-                --url749a3139386b2c8: url(\${url.resourcesPath}/build/logo192.png);
+                --urlf8277cddaa2be78: url(\${url.resourcesPath}/build/logo192.png) no-repeat center center;
                --url8bdc0887b97ac9a: url(\${url.resourcesPath}/build/static/media/something.svg);
            }
        `;
--- a/test/bin/setupSampleReactProject.spec.ts
+++ b/test/bin/setupSampleReactProject.spec.ts
@ -24,7 +24,7 @@ vi.mock("keycloakify/bin/keycloakify/parsed-package-json", async () => ({

 vi.mock("keycloakify/bin/promptKeycloakVersion", async () => ({
    ...((await vi.importActual("keycloakify/bin/promptKeycloakVersion")) as Record<string, unknown>),
-    promptKeycloakVersion: () => ({ "keycloakVersion": "11.0.3" })
+    promptKeycloakVersion: () => ({ keycloakVersion: "11.0.3" })
 }));

 const nativeCwd = process.cwd;
@ -52,25 +52,19 @@ describe("Sample Project", () => {
            await setupSampleReactProject(sampleReactProjectDirPath);
            await initializeEmailTheme();

-            const reactAppRootDirPath = process.cwd();
+            const projectDirPath = process.cwd();

            const destDirPath = pathJoin(
                readBuildOptions({
                    "processArgv": ["--silent"],
-                    reactAppRootDirPath
+                    projectDirPath
                }).keycloakifyBuildDirPath,
                "src",
                "main",
                "resources",
                "theme"
            );
-            await downloadBuiltinKeycloakTheme({
-                destDirPath,
-                "keycloakVersion": "11.0.3",
-                "buildOptions": {
-                    "cacheDirPath": pathJoin(reactAppRootDirPath, "node_modules", ".cache", "keycloakify")
-                }
-            });
+            await downloadBuiltinKeycloakTheme({ destDirPath, "keycloakVersion": "11.0.3", projectDirPath });
        },
        { timeout: 90000 }
    );
@ -86,25 +80,19 @@ describe("Sample Project", () => {
            await setupSampleReactProject(pathJoin(sampleReactProjectDirPath, "custom_input"));
            await initializeEmailTheme();

-            const reactAppRootDirPath = process.cwd();
+            const projectDirPath = process.cwd();

            const destDirPath = pathJoin(
                readBuildOptions({
                    "processArgv": ["--silent"],
-                    reactAppRootDirPath
+                    projectDirPath
                }).keycloakifyBuildDirPath,
                "src",
                "main",
                "resources",
                "theme"
            );
-            await downloadBuiltinKeycloakTheme({
-                destDirPath,
-                "keycloakVersion": "11.0.3",
-                buildOptions: {
-                    "cacheDirPath": pathJoin(reactAppRootDirPath, "node_modules", ".cache", "keycloakify")
-                }
-            });
+            await downloadBuiltinKeycloakTheme({ destDirPath, "keycloakVersion": "11.0.3", projectDirPath });
        },
        { timeout: 90000 }
    );
--- a/test/bin/tools/trimIndet.spec.ts
+++ b/test/bin/tools/trimIndet.spec.ts
@ -0,0 +1,65 @@
+import trimIndent from "keycloakify/bin/tools/trimIndent";
+import { it, describe, assert } from "vitest";
+
+describe("trimIndent", () => {
+    it("does not change a left-aligned string as expected", () => {
+        const txt = trimIndent`lorem
+ipsum`;
+        assert.equal(txt, ["lorem", "ipsum"].join("\n"));
+    });
+
+    it("removes leading and trailing empty lines from a left-aligned string", () => {
+        const txt = trimIndent`
+lorem
+ipsum
+`;
+        assert.equal(txt, ["lorem", "ipsum"].join("\n"));
+    });
+
+    it("removes indent from an aligned string", () => {
+        const txt = trimIndent`
+            lorem
+            ipsum
+        `;
+        assert.equal(txt, ["lorem", "ipsum"].join("\n"));
+    });
+
+    it("removes indent from unaligned string", () => {
+        const txt = trimIndent`
+            lorem
+                ipsum
+        `;
+        assert.equal(txt, ["lorem", "    ipsum"].join("\n"));
+    });
+
+    it("removes only first and last empty line", () => {
+        const txt = trimIndent`
+
+            lorem
+            ipsum
+
+            `;
+
+        assert.equal(txt, ["", "lorem", "ipsum", ""].join("\n"));
+    });
+
+    it("interpolates non-strings", () => {
+        const d = new Date();
+        const txt = trimIndent`
+            lorem
+            ${d}
+            ipsum`;
+
+        assert.equal(txt, ["lorem", String(d), "ipsum"].join("\n"));
+    });
+
+    it("inderpolates preserving new-lines in the interpolated bits", () => {
+        const a = ["ipsum", "dolor", "sit"].join("\n");
+        const txt = trimIndent`
+            lorem
+            ${a}
+            amet
+            `;
+        assert.equal(txt, ["lorem", "ipsum", "dolor", "sit", "amet"].join("\n"));
+    });
+});
--- a/yarn.lock
+++ b/yarn.lock
@ -4559,30 +4559,29 @@ check-error@^1.0.2:
  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
  integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==

-cheerio-select@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-2.1.0.tgz#4d8673286b8126ca2a8e42740d5e3c4884ae21b4"
-  integrity sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==
+cheerio-select-tmp@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz#55bbef02a4771710195ad736d5e346763ca4e646"
+  integrity sha512-YYs5JvbpU19VYJyj+F7oYrIE2BOll1/hRU7rEy/5+v9BzkSo3bK81iAeeQEMI92vRIxz677m72UmJUiVwwgjfQ==
  dependencies:
-    boolbase "^1.0.0"
-    css-select "^5.1.0"
-    css-what "^6.1.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
+    css-select "^3.1.2"
+    css-what "^4.0.0"
+    domelementtype "^2.1.0"
+    domhandler "^4.0.0"
+    domutils "^2.4.4"

-cheerio@^1.0.0-rc.5:
-  version "1.0.0-rc.12"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683"
-  integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==
+cheerio@1.0.0-rc.5:
+  version "1.0.0-rc.5"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.5.tgz#88907e1828674e8f9fee375188b27dadd4f0fa2f"
+  integrity sha512-yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw==
  dependencies:
-    cheerio-select "^2.1.0"
-    dom-serializer "^2.0.0"
-    domhandler "^5.0.3"
-    domutils "^3.0.1"
-    htmlparser2 "^8.0.1"
-    parse5 "^7.0.0"
-    parse5-htmlparser2-tree-adapter "^7.0.0"
+    cheerio-select-tmp "^0.1.0"
+    dom-serializer "~1.2.0"
+    domhandler "^4.0.0"
+    entities "~2.1.0"
+    htmlparser2 "^6.0.0"
+    parse5 "^6.0.0"
+    parse5-htmlparser2-tree-adapter "^6.0.0"

 chokidar@^2.1.8:
  version "2.1.8"
@ -5164,6 +5163,17 @@ css-loader@^5.0.1:
    schema-utils "^3.0.0"
    semver "^7.3.5"

+css-select@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-3.1.2.tgz#d52cbdc6fee379fba97fb0d3925abbd18af2d9d8"
+  integrity sha512-qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^4.0.0"
+    domhandler "^4.0.0"
+    domutils "^2.4.3"
+    nth-check "^2.0.0"
+
 css-select@^4.1.3:
  version "4.3.0"
  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
@ -5175,18 +5185,12 @@ css-select@^4.1.3:
    domutils "^2.8.0"
    nth-check "^2.0.1"

-css-select@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
-  integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.1.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
-    nth-check "^2.0.1"
+css-what@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-4.0.0.tgz#35e73761cab2eeb3d3661126b23d7aa0e8432233"
+  integrity sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A==

-css-what@^6.0.1, css-what@^6.1.0:
+css-what@^6.0.1:
  version "6.1.0"
  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
@ -5471,6 +5475,15 @@ dom-serializer@^2.0.0:
    domhandler "^5.0.2"
    entities "^4.2.0"

+dom-serializer@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz#3433d9136aeb3c627981daa385fc7f32d27c48f1"
+  integrity sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    entities "^2.0.0"
+
 dom-walk@^0.1.0:
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
@ -5481,7 +5494,7 @@ domain-browser@^1.1.1:
  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==

-domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
+domelementtype@^2.0.1, domelementtype@^2.1.0, domelementtype@^2.2.0, domelementtype@^2.3.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
@ -5500,7 +5513,7 @@ domhandler@^5.0, domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3:
  dependencies:
    domelementtype "^2.3.0"

-domutils@^2.5.2, domutils@^2.8.0:
+domutils@^2.4.3, domutils@^2.4.4, domutils@^2.5.2, domutils@^2.8.0:
  version "2.8.0"
  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
@ -5658,6 +5671,11 @@ entities@^4.2.0, entities@^4.4.0:
  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==

+entities@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+
 err-code@^2.0.2:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
@ -6987,7 +7005,7 @@ html-webpack-plugin@^5.0.0:
    pretty-error "^4.0.0"
    tapable "^2.0.0"

-htmlparser2@^6.1.0:
+htmlparser2@^6.0.0, htmlparser2@^6.1.0:
  version "6.1.0"
  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
@ -6997,7 +7015,7 @@ htmlparser2@^6.1.0:
    domutils "^2.5.2"
    entities "^2.0.0"

-htmlparser2@^8.0, htmlparser2@^8.0.1:
+htmlparser2@^8.0:
  version "8.0.2"
  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.2.tgz#f002151705b383e62433b5cf466f5b716edaec21"
  integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==
@ -8823,7 +8841,7 @@ npmlog@^5.0.1:
    gauge "^3.0.0"
    set-blocking "^2.0.0"

-nth-check@^2.0.1:
+nth-check@^2.0.0, nth-check@^2.0.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
@ -9176,26 +9194,18 @@ parse-json@^5.0.0:
    json-parse-even-better-errors "^2.3.0"
    lines-and-columns "^1.1.6"

-parse5-htmlparser2-tree-adapter@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz#23c2cc233bcf09bb7beba8b8a69d46b08c62c2f1"
-  integrity sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==
+parse5-htmlparser2-tree-adapter@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
+  integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
  dependencies:
-    domhandler "^5.0.2"
-    parse5 "^7.0.0"
+    parse5 "^6.0.1"

-parse5@^6.0.0:
+parse5@^6.0.0, parse5@^6.0.1:
  version "6.0.1"
  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==

-parse5@^7.0.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
-  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
-  dependencies:
-    entities "^4.4.0"
-
 parseurl@~1.3.2, parseurl@~1.3.3:
  version "1.3.3"
  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
Author	SHA1	Message	Date
Joseph Garrone	e2cccb4df1	Bump version	2024-09-30 11:40:19 +02:00
Joseph Garrone	cde8f11c60	Fix allegated vulnerability	2024-09-30 11:40:07 +02:00
Joseph Garrone	4272a860a2	Use tag v8 when releasing from this branch	2024-08-16 08:40:27 +02:00
Joseph Garrone	3186d33ad7	Release patch	2024-08-13 14:32:09 +02:00
Joseph Garrone	b7fb8f98ae	#607 Release patch for v8	2024-08-13 14:31:52 +02:00
Joseph Garrone	6e666b6ee2	Bump version	2024-02-27 23:18:33 +01:00
Joseph Garrone	4c66c9877a	#513	2024-02-27 23:18:19 +01:00
Joseph Garrone	e8fce5f796	Fix ftl script bug and definitively address #512 and #432	2024-02-27 06:54:10 +01:00
Joseph Garrone	481131d58b	update ci	2024-02-17 03:56:44 +01:00
Joseph Garrone	0a4e71e149	Bump version	2024-02-17 03:54:28 +01:00
Joseph Garrone	96f5139421	Follow up on #406	2024-02-17 03:54:11 +01:00