diff --git a/stories/account/PageStory.tsx b/stories/account/PageStory.tsx
index 579dbb28..59a589ae 100644
--- a/stories/account/PageStory.tsx
+++ b/stories/account/PageStory.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import type { KcContext } from "./KcContext";
 import KcApp from "./KcApp";
 import type { DeepPartial } from "../../dist/tools/DeepPartial";
-import { createGetKcContextMock } from "../../dist/account";
+import { createGetKcContextMock } from "../../dist/account/KcContext";
 import type { KcContextExtraProperties, KcContextExtraPropertiesPerPage } from "./KcContext";
 
 const kcContextExtraProperties: KcContextExtraProperties = {};
@@ -33,12 +33,3 @@ export function createPageStory<PageId extends KcContext["pageId"]>(params: { pa
 
     return { PageStory };
 }
-
-export const parameters = {
-    viewMode: "story",
-    previewTabs: {
-        "storybook/docs/panel": {
-            hidden: true
-        }
-    }
-};
diff --git a/stories/account/pages/Account.stories.tsx b/stories/account/pages/Account.stories.tsx
index f59417da..d6aad7c8 100644
--- a/stories/account/pages/Account.stories.tsx
+++ b/stories/account/pages/Account.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "account.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "account.ftl" });
 
 const meta = {
-    title: `account/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "account/account.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/account/pages/FederatedIdentity.stories.tsx b/stories/account/pages/FederatedIdentity.stories.tsx
index 707017ea..be5b4f09 100644
--- a/stories/account/pages/FederatedIdentity.stories.tsx
+++ b/stories/account/pages/FederatedIdentity.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "federatedIdentity.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "federatedIdentity.ftl" });
 
 const meta = {
-    title: `account/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "account/federatedIdentity.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/account/pages/Log.stories.tsx b/stories/account/pages/Log.stories.tsx
index 92b42b90..47fb5a05 100644
--- a/stories/account/pages/Log.stories.tsx
+++ b/stories/account/pages/Log.stories.tsx
@@ -1,15 +1,13 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
-
-const pageId = "log.ftl";
+import { createPageStory } from "../PageStory";
 
 const { PageStory } = createPageStory({
-    pageId
+    pageId: "log.ftl"
 });
 
 const meta = {
-    title: `account/${pageId}`,
+    title: "account/log.ftl",
     component: PageStory
 } satisfies Meta<typeof PageStory>;
 
diff --git a/stories/account/pages/Pasword.stories.tsx b/stories/account/pages/Pasword.stories.tsx
index ed66b159..c0ba3198 100644
--- a/stories/account/pages/Pasword.stories.tsx
+++ b/stories/account/pages/Pasword.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "password.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "password.ftl" });
 
 const meta = {
-    title: `account/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "account/password.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/account/pages/Sessions.stories.tsx b/stories/account/pages/Sessions.stories.tsx
index db5a4766..92dc8349 100644
--- a/stories/account/pages/Sessions.stories.tsx
+++ b/stories/account/pages/Sessions.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "sessions.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "sessions.ftl" });
 
 const meta = {
-    title: `account/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "account/sessions.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/account/pages/Totp.stories.tsx b/stories/account/pages/Totp.stories.tsx
index 9c4c59cc..86bda33b 100644
--- a/stories/account/pages/Totp.stories.tsx
+++ b/stories/account/pages/Totp.stories.tsx
@@ -1,17 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "totp.ftl";
-
-const { PageStory } = createPageStory({
-    pageId
-});
+const { PageStory } = createPageStory({ pageId: "totp.ftl" });
 
 const meta = {
-    title: `account/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "account/totp.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/PageStory.tsx b/stories/login/PageStory.tsx
index 06971e20..0997de63 100644
--- a/stories/login/PageStory.tsx
+++ b/stories/login/PageStory.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import type { KcContext } from "./KcContext";
 import KcApp from "./KcApp";
 import type { DeepPartial } from "../../dist/tools/DeepPartial";
-import { createGetKcContextMock } from "../../dist/login";
+import { createGetKcContextMock } from "../../dist/login/KcContext";
 import type { KcContextExtraProperties, KcContextExtraPropertiesPerPage } from "./KcContext";
 
 const kcContextExtraProperties: KcContextExtraProperties = {};
@@ -33,12 +33,3 @@ export function createPageStory<PageId extends KcContext["pageId"]>(params: { pa
 
     return { PageStory };
 }
-
-export const parameters = {
-    viewMode: "story",
-    previewTabs: {
-        "storybook/docs/panel": {
-            hidden: true
-        }
-    }
-};
diff --git a/stories/login/pages/Code.stories.tsx b/stories/login/pages/Code.stories.tsx
index 3e7361f1..cb15d4dd 100644
--- a/stories/login/pages/Code.stories.tsx
+++ b/stories/login/pages/Code.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "code.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "code.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/code.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/DeleteAccountConfirm.stories.tsx b/stories/login/pages/DeleteAccountConfirm.stories.tsx
index 79c127e2..87f25a4f 100644
--- a/stories/login/pages/DeleteAccountConfirm.stories.tsx
+++ b/stories/login/pages/DeleteAccountConfirm.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "delete-account-confirm.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "delete-account-confirm.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/delete-account-confirm.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/DeleteCredential.stories.tsx b/stories/login/pages/DeleteCredential.stories.tsx
index 36447459..4776b60a 100644
--- a/stories/login/pages/DeleteCredential.stories.tsx
+++ b/stories/login/pages/DeleteCredential.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "delete-credential.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "delete-credential.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/delete-credential.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/Error.stories.tsx b/stories/login/pages/Error.stories.tsx
index bd4b4c84..62e6405c 100644
--- a/stories/login/pages/Error.stories.tsx
+++ b/stories/login/pages/Error.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "error.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "error.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/error.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/FrontchannelLogout.stories.tsx b/stories/login/pages/FrontchannelLogout.stories.tsx
index d44437f7..49428037 100644
--- a/stories/login/pages/FrontchannelLogout.stories.tsx
+++ b/stories/login/pages/FrontchannelLogout.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "frontchannel-logout.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "frontchannel-logout.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/frontchannel-logout.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/IdpReviewUserProfile.stories.tsx b/stories/login/pages/IdpReviewUserProfile.stories.tsx
index 6255eadf..ad541998 100644
--- a/stories/login/pages/IdpReviewUserProfile.stories.tsx
+++ b/stories/login/pages/IdpReviewUserProfile.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "idp-review-user-profile.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "idp-review-user-profile.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/idp-review-user-profile.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/Info.stories.tsx b/stories/login/pages/Info.stories.tsx
index cc47ba84..11582261 100644
--- a/stories/login/pages/Info.stories.tsx
+++ b/stories/login/pages/Info.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "info.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "info.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/info.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/Login.stories.tsx b/stories/login/pages/Login.stories.tsx
index c53b2eca..f1a0a3d2 100644
--- a/stories/login/pages/Login.stories.tsx
+++ b/stories/login/pages/Login.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginConfigTotp.stories.tsx b/stories/login/pages/LoginConfigTotp.stories.tsx
index 39f1624a..3b5732b3 100644
--- a/stories/login/pages/LoginConfigTotp.stories.tsx
+++ b/stories/login/pages/LoginConfigTotp.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-config-totp.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-config-totp.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-config-totp.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginDeviceVerifyUserCode.stories.tsx b/stories/login/pages/LoginDeviceVerifyUserCode.stories.tsx
index 1a55debb..e124bab3 100644
--- a/stories/login/pages/LoginDeviceVerifyUserCode.stories.tsx
+++ b/stories/login/pages/LoginDeviceVerifyUserCode.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-oauth2-device-verify-user-code.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-oauth2-device-verify-user-code.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-oauth2-device-verify-user-code.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginIdpLinkConfirm.stories.tsx b/stories/login/pages/LoginIdpLinkConfirm.stories.tsx
index ddda452c..dd5db319 100644
--- a/stories/login/pages/LoginIdpLinkConfirm.stories.tsx
+++ b/stories/login/pages/LoginIdpLinkConfirm.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-idp-link-confirm.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-idp-link-confirm.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-idp-link-confirm.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginIdpLinkEmail.stories.tsx b/stories/login/pages/LoginIdpLinkEmail.stories.tsx
index b0a2a916..79b1dc94 100644
--- a/stories/login/pages/LoginIdpLinkEmail.stories.tsx
+++ b/stories/login/pages/LoginIdpLinkEmail.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-idp-link-email.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-idp-link-email.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-idp-link-email.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginOauth2DeviceVerifyUserCode.stories.tsx b/stories/login/pages/LoginOauth2DeviceVerifyUserCode.stories.tsx
index 1a55debb..e124bab3 100644
--- a/stories/login/pages/LoginOauth2DeviceVerifyUserCode.stories.tsx
+++ b/stories/login/pages/LoginOauth2DeviceVerifyUserCode.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-oauth2-device-verify-user-code.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-oauth2-device-verify-user-code.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-oauth2-device-verify-user-code.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginOauthGrant.stories.tsx b/stories/login/pages/LoginOauthGrant.stories.tsx
index 95ffae32..bfcb7465 100644
--- a/stories/login/pages/LoginOauthGrant.stories.tsx
+++ b/stories/login/pages/LoginOauthGrant.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-oauth-grant.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-oauth-grant.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-oauth-grant.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginOtp.stories.tsx b/stories/login/pages/LoginOtp.stories.tsx
index fc6ce257..a5c9c646 100644
--- a/stories/login/pages/LoginOtp.stories.tsx
+++ b/stories/login/pages/LoginOtp.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-otp.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-otp.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-otp.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginPageExpired.stories.tsx b/stories/login/pages/LoginPageExpired.stories.tsx
index fa1a97cb..3d3f6020 100644
--- a/stories/login/pages/LoginPageExpired.stories.tsx
+++ b/stories/login/pages/LoginPageExpired.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-page-expired.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-page-expired.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-page-expired.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginPassword.stories.tsx b/stories/login/pages/LoginPassword.stories.tsx
index f34c3245..66e42a3d 100644
--- a/stories/login/pages/LoginPassword.stories.tsx
+++ b/stories/login/pages/LoginPassword.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-password.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-password.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-password.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginRecoveryAuthnCodeConfig.stories.tsx b/stories/login/pages/LoginRecoveryAuthnCodeConfig.stories.tsx
index e6dbd2a9..0afb8247 100644
--- a/stories/login/pages/LoginRecoveryAuthnCodeConfig.stories.tsx
+++ b/stories/login/pages/LoginRecoveryAuthnCodeConfig.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-recovery-authn-code-config.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-recovery-authn-code-config.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-recovery-authn-code-config.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginRecoveryAuthnCodeInput.stories.tsx b/stories/login/pages/LoginRecoveryAuthnCodeInput.stories.tsx
index ed60d9c5..88a344dd 100644
--- a/stories/login/pages/LoginRecoveryAuthnCodeInput.stories.tsx
+++ b/stories/login/pages/LoginRecoveryAuthnCodeInput.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-recovery-authn-code-input.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-recovery-authn-code-input.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-recovery-authn-code-input.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginResetOtp.stories.tsx b/stories/login/pages/LoginResetOtp.stories.tsx
index 3c48b3d3..16dc5625 100644
--- a/stories/login/pages/LoginResetOtp.stories.tsx
+++ b/stories/login/pages/LoginResetOtp.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-reset-otp.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-reset-otp.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-reset-otp.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginResetPassword.stories.tsx b/stories/login/pages/LoginResetPassword.stories.tsx
index 38b84b46..53bae39a 100644
--- a/stories/login/pages/LoginResetPassword.stories.tsx
+++ b/stories/login/pages/LoginResetPassword.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-reset-password.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-reset-password.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-reset-password.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginUpdatePassword.stories.tsx b/stories/login/pages/LoginUpdatePassword.stories.tsx
index 79f21dbb..35e38e28 100644
--- a/stories/login/pages/LoginUpdatePassword.stories.tsx
+++ b/stories/login/pages/LoginUpdatePassword.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-update-password.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-update-password.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-update-password.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginUpdateProfile.stories.tsx b/stories/login/pages/LoginUpdateProfile.stories.tsx
index b785ee6a..a7e4f394 100644
--- a/stories/login/pages/LoginUpdateProfile.stories.tsx
+++ b/stories/login/pages/LoginUpdateProfile.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-update-profile.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-update-profile.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-update-profile.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginUsername.stories.tsx b/stories/login/pages/LoginUsername.stories.tsx
index de809cce..07818c80 100644
--- a/stories/login/pages/LoginUsername.stories.tsx
+++ b/stories/login/pages/LoginUsername.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-username.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-username.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-username.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginVerifyEmail.stories.tsx b/stories/login/pages/LoginVerifyEmail.stories.tsx
index 567d89d1..31482071 100644
--- a/stories/login/pages/LoginVerifyEmail.stories.tsx
+++ b/stories/login/pages/LoginVerifyEmail.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-verify-email.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-verify-email.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-verify-email.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LoginX509Info.stories.tsx b/stories/login/pages/LoginX509Info.stories.tsx
index 915a2868..432a37aa 100644
--- a/stories/login/pages/LoginX509Info.stories.tsx
+++ b/stories/login/pages/LoginX509Info.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "login-x509-info.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "login-x509-info.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/login-x509-info.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/LogoutConfirm.stories.tsx b/stories/login/pages/LogoutConfirm.stories.tsx
index efeeb227..5e3d11fe 100644
--- a/stories/login/pages/LogoutConfirm.stories.tsx
+++ b/stories/login/pages/LogoutConfirm.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "logout-confirm.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "logout-confirm.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/logout-confirm.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/Register.stories.tsx b/stories/login/pages/Register.stories.tsx
index 2b3eb6c2..b7542c1b 100644
--- a/stories/login/pages/Register.stories.tsx
+++ b/stories/login/pages/Register.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "register.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "register.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/register.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/SamlPostForm.stories.tsx b/stories/login/pages/SamlPostForm.stories.tsx
index 51f10a10..88aa03aa 100644
--- a/stories/login/pages/SamlPostForm.stories.tsx
+++ b/stories/login/pages/SamlPostForm.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "saml-post-form.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "saml-post-form.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/saml-post-form.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/SelectAuthenticator.stories.tsx b/stories/login/pages/SelectAuthenticator.stories.tsx
index f5210d4a..5e80b30c 100644
--- a/stories/login/pages/SelectAuthenticator.stories.tsx
+++ b/stories/login/pages/SelectAuthenticator.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "select-authenticator.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "select-authenticator.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/select-authenticator.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/Terms.stories.tsx b/stories/login/pages/Terms.stories.tsx
index 2df374d5..31ae9cc4 100644
--- a/stories/login/pages/Terms.stories.tsx
+++ b/stories/login/pages/Terms.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "terms.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "terms.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/terms.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/UpdateEmail.stories.tsx b/stories/login/pages/UpdateEmail.stories.tsx
index 3de246b3..b7ba3499 100644
--- a/stories/login/pages/UpdateEmail.stories.tsx
+++ b/stories/login/pages/UpdateEmail.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "update-email.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "update-email.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/update-email.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/WebauthnAuthenticate.stories.tsx b/stories/login/pages/WebauthnAuthenticate.stories.tsx
index 713f54c5..4c11c679 100644
--- a/stories/login/pages/WebauthnAuthenticate.stories.tsx
+++ b/stories/login/pages/WebauthnAuthenticate.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "webauthn-authenticate.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "webauthn-authenticate.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/webauthn-authenticate.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/WebauthnError.stories.tsx b/stories/login/pages/WebauthnError.stories.tsx
index d3f7aa5c..6ce6a81a 100644
--- a/stories/login/pages/WebauthnError.stories.tsx
+++ b/stories/login/pages/WebauthnError.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "webauthn-error.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "webauthn-error.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/webauthn-error.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;
diff --git a/stories/login/pages/WebauthnRegister.stories.tsx b/stories/login/pages/WebauthnRegister.stories.tsx
index 14a0d192..96d0867b 100644
--- a/stories/login/pages/WebauthnRegister.stories.tsx
+++ b/stories/login/pages/WebauthnRegister.stories.tsx
@@ -1,15 +1,12 @@
 import React from "react";
 import type { Meta, StoryObj } from "@storybook/react";
-import { createPageStory, parameters } from "../PageStory";
+import { createPageStory } from "../PageStory";
 
-const pageId = "webauthn-register.ftl";
-
-const { PageStory } = createPageStory({ pageId });
+const { PageStory } = createPageStory({ pageId: "webauthn-register.ftl" });
 
 const meta = {
-    title: `login/${pageId}`,
-    component: PageStory,
-    parameters
+    title: "login/webauthn-register.ftl",
+    component: PageStory
 } satisfies Meta<typeof PageStory>;
 
 export default meta;