diff --git a/src/account/kcContext/getKcContextFromWindow.ts b/src/account/kcContext/getKcContextFromWindow.ts
index dc221d39..0c4de775 100644
--- a/src/account/kcContext/getKcContextFromWindow.ts
+++ b/src/account/kcContext/getKcContextFromWindow.ts
@@ -1,5 +1,5 @@
 import type { AndByDiscriminatingKey } from "keycloakify/tools/AndByDiscriminatingKey";
-import { ftlValuesGlobalName } from "keycloakify/bin/keycloakify/ftlValuesGlobalName";
+import { nameOfTheGlobal } from "keycloakify/bin/constants";
 import type { KcContext } from "./KcContext";
 
 export type ExtendKcContext<KcContextExtension extends { pageId: string }> = [KcContextExtension] extends [never]
@@ -7,5 +7,5 @@ export type ExtendKcContext<KcContextExtension extends { pageId: string }> = [Kc
     : AndByDiscriminatingKey<"pageId", KcContextExtension & KcContext.Common, KcContext>;
 
 export function getKcContextFromWindow<KcContextExtension extends { pageId: string } = never>(): ExtendKcContext<KcContextExtension> | undefined {
-    return typeof window === "undefined" ? undefined : (window as any)[ftlValuesGlobalName];
+    return typeof window === "undefined" ? undefined : (window as any)[nameOfTheGlobal];
 }
diff --git a/src/bin/keycloakify/generateFtl/generateFtl.ts b/src/bin/keycloakify/generateFtl/generateFtl.ts
index 00b61e5f..6c8b18a3 100644
--- a/src/bin/keycloakify/generateFtl/generateFtl.ts
+++ b/src/bin/keycloakify/generateFtl/generateFtl.ts
@@ -1,5 +1,5 @@
 import cheerio from "cheerio";
-import { replaceImportsFromStaticInJsCode } from "../replacers/replaceImportsFromStaticInJsCode";
+import { replaceImportsInJsCode } from "../replacers/replaceImportsInJsCode";
 import { generateCssCodeToDefineGlobals } from "../replacers/replaceImportsInCssCode";
 import { replaceImportsInInlineCssCode } from "../replacers/replaceImportsInInlineCssCode";
 import * as fs from "fs";
@@ -10,8 +10,11 @@ import { assert } from "tsafe/assert";
 import { type ThemeType, nameOfTheGlobal, basenameOfTheKeycloakifyResourcesDir } from "../../constants";
 
 export type BuildOptionsLike = {
+    bundler: "vite" | "webpack";
     themeVersion: string;
     urlPathname: string | undefined;
+    reactAppBuildDirPath: string;
+    assetsDirPath: string;
 };
 
 assert<BuildOptions extends BuildOptionsLike ? true : false>();
@@ -35,7 +38,7 @@ export function generateFtlFilesCodeFactory(params: {
 
             assert(jsCode !== null);
 
-            const { fixedJsCode } = replaceImportsFromStaticInJsCode({ jsCode, "bundler": "vite" });
+            const { fixedJsCode } = replaceImportsInJsCode({ jsCode, buildOptions });
 
             $(element).text(fixedJsCode);
         });
diff --git a/src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts b/src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts
index 9ee96110..3c7e1f1b 100644
--- a/src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts
+++ b/src/bin/keycloakify/generateJavaStackFiles/bringInAccountV1.ts
@@ -7,7 +7,7 @@ import { resources_common, lastKeycloakVersionWithAccountV1, accountV1ThemeName
 import { downloadBuiltinKeycloakTheme } from "../../download-builtin-keycloak-theme";
 import { transformCodebase } from "../../tools/transformCodebase";
 
-export type BuildOptionsLike = {
+type BuildOptionsLike = {
     keycloakifyBuildDirPath: string;
     cacheDirPath: string;
 };
diff --git a/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts b/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts
index d31e056f..845f2c3f 100644
--- a/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts
+++ b/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts
@@ -6,7 +6,7 @@ import type { BuildOptions } from "../buildOptions";
 import { type ThemeType, accountV1ThemeName } from "../../constants";
 import { bringInAccountV1 } from "./bringInAccountV1";
 
-export type BuildOptionsLike = {
+type BuildOptionsLike = {
     groupId: string;
     artifactId: string;
     themeVersion: string;
diff --git a/src/bin/keycloakify/generateTheme/generateTheme.ts b/src/bin/keycloakify/generateTheme/generateTheme.ts
index 5fcabb00..a53d9af9 100644
--- a/src/bin/keycloakify/generateTheme/generateTheme.ts
+++ b/src/bin/keycloakify/generateTheme/generateTheme.ts
@@ -1,7 +1,7 @@
 import { transformCodebase } from "../../tools/transformCodebase";
 import * as fs from "fs";
 import { join as pathJoin, resolve as pathResolve } from "path";
-import { replaceImportsFromStaticInJsCode } from "../replacers/replaceImportsFromStaticInJsCode";
+import { replaceImportsInJsCode } from "../replacers/replaceImportsInJsCode";
 import { replaceImportsInCssCode } from "../replacers/replaceImportsInCssCode";
 import { generateFtlFilesCodeFactory, loginThemePageIds, accountThemePageIds } from "../generateFtl";
 import {
@@ -22,12 +22,15 @@ import { generateMessageProperties } from "./generateMessageProperties";
 import { readStaticResourcesUsage } from "./readStaticResourcesUsage";
 
 export type BuildOptionsLike = {
+    bundler: "vite" | "webpack";
     extraThemeProperties: string[] | undefined;
     themeVersion: string;
     loginThemeResourcesFromKeycloakVersion: string;
     keycloakifyBuildDirPath: string;
     reactAppBuildDirPath: string;
     cacheDirPath: string;
+    assetsDirPath: string;
+    urlPathname: string | undefined;
 };
 
 assert<BuildOptions extends BuildOptionsLike ? true : false>();
@@ -98,9 +101,9 @@ export async function generateTheme(params: {
                     }
 
                     if (/\.js?$/i.test(filePath)) {
-                        const { fixedJsCode } = replaceImportsFromStaticInJsCode({
+                        const { fixedJsCode } = replaceImportsInJsCode({
                             "jsCode": sourceCode.toString("utf8"),
-                            "bundler": "vite"
+                            buildOptions
                         });
 
                         return { "modifiedSourceCode": Buffer.from(fixedJsCode, "utf8") };
diff --git a/src/login/kcContext/getKcContextFromWindow.ts b/src/login/kcContext/getKcContextFromWindow.ts
index 799dad34..c3360657 100644
--- a/src/login/kcContext/getKcContextFromWindow.ts
+++ b/src/login/kcContext/getKcContextFromWindow.ts
@@ -1,11 +1,11 @@
 import type { KcContext } from "./KcContext";
 import type { AndByDiscriminatingKey } from "keycloakify/tools/AndByDiscriminatingKey";
-import { ftlValuesGlobalName } from "keycloakify/bin/keycloakify/ftlValuesGlobalName";
+import { nameOfTheGlobal } from "keycloakify/bin/constants";
 
 export type ExtendKcContext<KcContextExtension extends { pageId: string }> = [KcContextExtension] extends [never]
     ? KcContext
     : AndByDiscriminatingKey<"pageId", KcContextExtension & KcContext.Common, KcContext>;
 
 export function getKcContextFromWindow<KcContextExtension extends { pageId: string } = never>(): ExtendKcContext<KcContextExtension> | undefined {
-    return typeof window === "undefined" ? undefined : (window as any)[ftlValuesGlobalName];
+    return typeof window === "undefined" ? undefined : (window as any)[nameOfTheGlobal];
 }