diff --git a/src/keycloak-theme/pages/Error.stories.tsx b/src/keycloak-theme/pages/Error.stories.tsx
index ec176d8..768a6d1 100644
--- a/src/keycloak-theme/pages/Error.stories.tsx
+++ b/src/keycloak-theme/pages/Error.stories.tsx
@@ -6,7 +6,7 @@ const bind = template('error.ftl');
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/Error',
+    title: 'Theme/Pages/Notification/Error',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',
diff --git a/src/keycloak-theme/pages/IdpReviewUserProfile.stories.tsx b/src/keycloak-theme/pages/IdpReviewUserProfile.stories.tsx
index a468855..e3d6915 100644
--- a/src/keycloak-theme/pages/IdpReviewUserProfile.stories.tsx
+++ b/src/keycloak-theme/pages/IdpReviewUserProfile.stories.tsx
@@ -4,7 +4,7 @@ import {template} from '../../../.storybook/util'
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/Login/Review IDP User Profile',
+    title: 'Theme/Pages/IDP/Review User Profile',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',
diff --git a/src/keycloak-theme/pages/Info.stories.tsx b/src/keycloak-theme/pages/Info.stories.tsx
index 3c9cdd5..e6bacc5 100644
--- a/src/keycloak-theme/pages/Info.stories.tsx
+++ b/src/keycloak-theme/pages/Info.stories.tsx
@@ -4,7 +4,7 @@ import {template} from '../../../.storybook/util'
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/Info',
+    title: 'Theme/Pages/Notification/Info',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',
diff --git a/src/keycloak-theme/pages/LoginConfigTotp.stories.tsx b/src/keycloak-theme/pages/LoginConfigTotp.stories.tsx
index a3a4781..b0a673f 100644
--- a/src/keycloak-theme/pages/LoginConfigTotp.stories.tsx
+++ b/src/keycloak-theme/pages/LoginConfigTotp.stories.tsx
@@ -4,7 +4,7 @@ import {template} from '../../../.storybook/util'
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/Login/Configure TOTP',
+    title: 'Theme/Pages/Actions/Configure TOTP',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',
diff --git a/src/keycloak-theme/pages/LoginIdpLinkConfirm.stories.tsx b/src/keycloak-theme/pages/LoginIdpLinkConfirm.stories.tsx
index 901b5ca..55ff499 100644
--- a/src/keycloak-theme/pages/LoginIdpLinkConfirm.stories.tsx
+++ b/src/keycloak-theme/pages/LoginIdpLinkConfirm.stories.tsx
@@ -4,7 +4,7 @@ import {template} from '../../../.storybook/util'
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/Login/Confirm IDP Link',
+    title: 'Theme/Pages/IDP/Confirm Link',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',
diff --git a/src/keycloak-theme/pages/LoginIdpLinkEmail.stories.tsx b/src/keycloak-theme/pages/LoginIdpLinkEmail.stories.tsx
index f7aac4e..98f280b 100644
--- a/src/keycloak-theme/pages/LoginIdpLinkEmail.stories.tsx
+++ b/src/keycloak-theme/pages/LoginIdpLinkEmail.stories.tsx
@@ -4,7 +4,7 @@ import {template} from '../../../.storybook/util'
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/Login/Confirm IDP Email',
+    title: 'Theme/Pages/IDP/Confirm Email',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',
diff --git a/src/keycloak-theme/pages/LoginOtp.stories.tsx b/src/keycloak-theme/pages/LoginOtp.stories.tsx
index b9d8a48..21e90bb 100644
--- a/src/keycloak-theme/pages/LoginOtp.stories.tsx
+++ b/src/keycloak-theme/pages/LoginOtp.stories.tsx
@@ -1,10 +1,10 @@
 import {ComponentMeta} from '@storybook/react';
 import KcApp from '../KcApp';
-import {socialProviders, template} from '../../../.storybook/util'
+import {template} from '../../../.storybook/util'
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/Login/Login OTP',
+    title: 'Theme/Pages/Login/OTP',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',
diff --git a/src/keycloak-theme/pages/LoginResetPassword.stories.tsx b/src/keycloak-theme/pages/LoginResetPassword.stories.tsx
index 5d3aa02..9ea3736 100644
--- a/src/keycloak-theme/pages/LoginResetPassword.stories.tsx
+++ b/src/keycloak-theme/pages/LoginResetPassword.stories.tsx
@@ -4,7 +4,7 @@ import {template} from '../../../.storybook/util'
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/Login/Password Reset',
+    title: 'Theme/Pages/Login/Reset Password',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',
diff --git a/src/keycloak-theme/pages/LoginUpdatePassword.stories.tsx b/src/keycloak-theme/pages/LoginUpdatePassword.stories.tsx
index 9a68d43..cf5177e 100644
--- a/src/keycloak-theme/pages/LoginUpdatePassword.stories.tsx
+++ b/src/keycloak-theme/pages/LoginUpdatePassword.stories.tsx
@@ -4,7 +4,7 @@ import {template} from '../../../.storybook/util'
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/Login/Password Update',
+    title: 'Theme/Pages/Actions/Update Password',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',
diff --git a/src/keycloak-theme/pages/MyExtraPage1.stories.tsx b/src/keycloak-theme/pages/MyExtraPage1.stories.tsx
index 8473785..ef3e198 100644
--- a/src/keycloak-theme/pages/MyExtraPage1.stories.tsx
+++ b/src/keycloak-theme/pages/MyExtraPage1.stories.tsx
@@ -4,7 +4,7 @@ import {template} from '../../../.storybook/util'
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/My Extra Page 1',
+    title: 'Theme/Pages/Custom/My Extra Page 1',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',
diff --git a/src/keycloak-theme/pages/MyExtraPage2.stories.tsx b/src/keycloak-theme/pages/MyExtraPage2.stories.tsx
index 1d0f004..196f5a0 100644
--- a/src/keycloak-theme/pages/MyExtraPage2.stories.tsx
+++ b/src/keycloak-theme/pages/MyExtraPage2.stories.tsx
@@ -4,7 +4,7 @@ import {template} from '../../../.storybook/util'
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/My Extra Page 2',
+    title: 'Theme/Pages/Custom/My Extra Page 2',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',
diff --git a/src/keycloak-theme/pages/Register.stories.tsx b/src/keycloak-theme/pages/Register.stories.tsx
index 5bbbd2d..6947fff 100644
--- a/src/keycloak-theme/pages/Register.stories.tsx
+++ b/src/keycloak-theme/pages/Register.stories.tsx
@@ -4,7 +4,7 @@ import {template} from '../../../.storybook/util'
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/Register',
+    title: 'Theme/Pages/Register/Legacy',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',
diff --git a/src/keycloak-theme/pages/RegisterUserProfile.stories.tsx b/src/keycloak-theme/pages/RegisterUserProfile.stories.tsx
index 1f2149c..3e34c39 100644
--- a/src/keycloak-theme/pages/RegisterUserProfile.stories.tsx
+++ b/src/keycloak-theme/pages/RegisterUserProfile.stories.tsx
@@ -6,7 +6,7 @@ const bind = template('register-user-profile.ftl')
 
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/Register User Profile',
+    title: 'Theme/Pages/Register/Modern',
     component: KcApp,
     parameters: {layout: 'fullscreen'},
 } as ComponentMeta<typeof KcApp>;
diff --git a/src/keycloak-theme/pages/Terms.stories.tsx b/src/keycloak-theme/pages/Terms.stories.tsx
index 1fd20ac..5f5e238 100644
--- a/src/keycloak-theme/pages/Terms.stories.tsx
+++ b/src/keycloak-theme/pages/Terms.stories.tsx
@@ -5,7 +5,7 @@ import {template} from '../../../.storybook/util'
 const bind = template('terms.ftl');
 export default {
     kind: 'Page',
-    title: 'Theme/Pages/Terms',
+    title: 'Theme/Pages/Actions/Terms',
     component: KcApp,
     parameters: {
         layout: 'fullscreen',