diff --git a/src/bin/keycloakify/buildJars/buildJars.ts b/src/bin/keycloakify/buildJars/buildJars.ts
index 19fef589..271ee564 100644
--- a/src/bin/keycloakify/buildJars/buildJars.ts
+++ b/src/bin/keycloakify/buildJars/buildJars.ts
@@ -12,8 +12,11 @@ export type BuildOptionsLike = BuildOptionsLike_buildJar & {
 
 assert<BuildOptions extends BuildOptionsLike ? true : false>();
 
-export async function buildJars(params: { doesImplementAccountTheme: boolean; buildOptions: BuildOptionsLike }): Promise<void> {
-    const { doesImplementAccountTheme, buildOptions } = params;
+export async function buildJars(params: { buildOptions: BuildOptionsLike }): Promise<void> {
+    const { buildOptions } = params;
+
+    // TODO:
+    const doesImplementAccountTheme= ;
 
     await Promise.all(
         keycloakAccountV1Versions
diff --git a/src/bin/keycloakify/generateTheme/bringInAccountV1.ts b/src/bin/keycloakify/generateSrcMainResources/bringInAccountV1.ts
similarity index 100%
rename from src/bin/keycloakify/generateTheme/bringInAccountV1.ts
rename to src/bin/keycloakify/generateSrcMainResources/bringInAccountV1.ts
diff --git a/src/bin/keycloakify/generateTheme/generateMessageProperties.ts b/src/bin/keycloakify/generateSrcMainResources/generateMessageProperties.ts
similarity index 100%
rename from src/bin/keycloakify/generateTheme/generateMessageProperties.ts
rename to src/bin/keycloakify/generateSrcMainResources/generateMessageProperties.ts
diff --git a/src/bin/keycloakify/generateTheme/generateTheme.ts b/src/bin/keycloakify/generateSrcMainResources/generateSrcMainResources.ts
similarity index 53%
rename from src/bin/keycloakify/generateTheme/generateTheme.ts
rename to src/bin/keycloakify/generateSrcMainResources/generateSrcMainResources.ts
index 6d8336de..d9f62ab2 100644
--- a/src/bin/keycloakify/generateTheme/generateTheme.ts
+++ b/src/bin/keycloakify/generateSrcMainResources/generateSrcMainResources.ts
@@ -1,27 +1,26 @@
 import type { BuildOptions } from "../../shared/buildOptions";
 import { assert } from "tsafe/assert";
-import { generateSrcMainResources, type BuildOptionsLike as BuildOptionsLike_generateSrcMainResources } from "./generateSrcMainResources";
-import { generateThemeVariations } from "./generateThemeVariants";
+import { generateSrcMainResourcesForMainTheme, type BuildOptionsLike as BuildOptionsLike_generateSrcMainResourcesForMainTheme } from "./generateSrcMainResourcesForMainTheme";
+import { generateSrcMainResourcesForThemeVariant } from "./generateSrcMainResourcesForThemeVariant";
 
-export type BuildOptionsLike = BuildOptionsLike_generateSrcMainResources & {
-    keycloakifyBuildDirPath: string;
+export type BuildOptionsLike = BuildOptionsLike_generateSrcMainResourcesForMainTheme & {
     themeNames: string[];
 };
 
 assert<BuildOptions extends BuildOptionsLike ? true : false>();
 
-export async function generateTheme(params: { buildOptions: BuildOptionsLike }): Promise<void> {
+export async function generateSrcMainResources(params: { buildOptions: BuildOptionsLike }): Promise<void> {
     const { buildOptions } = params;
 
     const [themeName, ...themeVariantNames] = buildOptions.themeNames;
 
-    await generateSrcMainResources({
+    await generateSrcMainResourcesForMainTheme({
         themeName,
         buildOptions
     });
 
     for (const themeVariantName of themeVariantNames) {
-        generateThemeVariations({
+        generateSrcMainResourcesForThemeVariant({
             themeName,
             themeVariantName,
             buildOptions
diff --git a/src/bin/keycloakify/generateTheme/generateSrcMainResources.ts b/src/bin/keycloakify/generateSrcMainResources/generateSrcMainResourcesForMainTheme.ts
similarity index 98%
rename from src/bin/keycloakify/generateTheme/generateSrcMainResources.ts
rename to src/bin/keycloakify/generateSrcMainResources/generateSrcMainResourcesForMainTheme.ts
index 270ebaca..38584b41 100644
--- a/src/bin/keycloakify/generateTheme/generateSrcMainResources.ts
+++ b/src/bin/keycloakify/generateSrcMainResources/generateSrcMainResourcesForMainTheme.ts
@@ -40,7 +40,10 @@ export type BuildOptionsLike = {
 
 assert<BuildOptions extends BuildOptionsLike ? true : false>();
 
-export async function generateSrcMainResources(params: { themeName: string; buildOptions: BuildOptionsLike }): Promise<void> {
+export async function generateSrcMainResourcesForMainTheme(params: { 
+    themeName: string; 
+    buildOptions: BuildOptionsLike 
+}): Promise<void> {
     const { themeName, buildOptions } = params;
 
     const { themeSrcDirPath } = getThemeSrcDirPath({ "reactAppRootDirPath": buildOptions.reactAppRootDirPath });
diff --git a/src/bin/keycloakify/generateTheme/generateThemeVariants.ts b/src/bin/keycloakify/generateSrcMainResources/generateSrcMainResourcesForThemeVariant.ts
similarity index 94%
rename from src/bin/keycloakify/generateTheme/generateThemeVariants.ts
rename to src/bin/keycloakify/generateSrcMainResources/generateSrcMainResourcesForThemeVariant.ts
index dbc916f3..0f68f2bd 100644
--- a/src/bin/keycloakify/generateTheme/generateThemeVariants.ts
+++ b/src/bin/keycloakify/generateSrcMainResources/generateSrcMainResourcesForThemeVariant.ts
@@ -10,7 +10,7 @@ export type BuildOptionsLike = {
 
 assert<BuildOptions extends BuildOptionsLike ? true : false>();
 
-export function generateThemeVariations(params: { themeName: string; themeVariantName: string; buildOptions: BuildOptionsLike }) {
+export function generateSrcMainResourcesForThemeVariant(params: { themeName: string; themeVariantName: string; buildOptions: BuildOptionsLike }) {
     const { themeName, themeVariantName, buildOptions } = params;
 
     const mainThemeDirPath = pathJoin(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme", themeName);
diff --git a/src/bin/keycloakify/generateSrcMainResources/index.ts b/src/bin/keycloakify/generateSrcMainResources/index.ts
new file mode 100644
index 00000000..aeeeffe9
--- /dev/null
+++ b/src/bin/keycloakify/generateSrcMainResources/index.ts
@@ -0,0 +1 @@
+export * from "./generateSrcMainResources";
diff --git a/src/bin/keycloakify/generateTheme/readExtraPageNames.ts b/src/bin/keycloakify/generateSrcMainResources/readExtraPageNames.ts
similarity index 100%
rename from src/bin/keycloakify/generateTheme/readExtraPageNames.ts
rename to src/bin/keycloakify/generateSrcMainResources/readExtraPageNames.ts
diff --git a/src/bin/keycloakify/generateTheme/readFieldNameUsage.ts b/src/bin/keycloakify/generateSrcMainResources/readFieldNameUsage.ts
similarity index 100%
rename from src/bin/keycloakify/generateTheme/readFieldNameUsage.ts
rename to src/bin/keycloakify/generateSrcMainResources/readFieldNameUsage.ts
diff --git a/src/bin/keycloakify/generateTheme/index.ts b/src/bin/keycloakify/generateTheme/index.ts
deleted file mode 100644
index e31458d9..00000000
--- a/src/bin/keycloakify/generateTheme/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./generateTheme";
diff --git a/src/bin/keycloakify/keycloakify.ts b/src/bin/keycloakify/keycloakify.ts
index 00dfcdbc..767ef2de 100644
--- a/src/bin/keycloakify/keycloakify.ts
+++ b/src/bin/keycloakify/keycloakify.ts
@@ -1,4 +1,4 @@
-import { generateTheme } from "./generateTheme";
+import { generateSrcMainResources } from "./generateSrcMainResources";
 import { join as pathJoin, relative as pathRelative, sep as pathSep } from "path";
 import * as child_process from "child_process";
 import * as fs from "fs";
@@ -25,7 +25,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         fs.writeFileSync(pathJoin(buildOptions.keycloakifyBuildDirPath, ".gitignore"), Buffer.from("*", "utf8"));
     }
 
-    await generateTheme({ buildOptions });
+    await generateSrcMainResources({ buildOptions });
 
     run_post_build_script: {
         if (buildOptions.bundler !== "vite") {
@@ -41,13 +41,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         });
     }
 
-    // TODO: find from META-INF/keycloak-themes.json
-    const doesImplementAccountTheme = true;
-
-    await buildJars({
-        doesImplementAccountTheme,
-        buildOptions
-    });
+    await buildJars({ buildOptions });
 
     logger.log(
         `✅ Your keycloak theme has been generated and bundled into .${pathSep}${pathJoin(