diff --git a/src/lib/components/filters/store.ts b/src/lib/components/filters/store.ts
index 70d106283..734f5e581 100644
--- a/src/lib/components/filters/store.ts
+++ b/src/lib/components/filters/store.ts
@@ -1,5 +1,5 @@
 import { goto } from '$app/navigation';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import deepEqual from 'deep-equal';
 import { Query } from '@appwrite.io/console';
 import { toLocaleDateTime } from '$lib/helpers/date';
diff --git a/src/lib/components/sidebar.svelte b/src/lib/components/sidebar.svelte
index 06b4bf624..8572b20cb 100644
--- a/src/lib/components/sidebar.svelte
+++ b/src/lib/components/sidebar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { page } from '$lib/stores/page';
+    import { page } from '$app/stores';
     import { app } from '$lib/stores/app';
     import { fade } from 'svelte/transition';
     import {
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index b17da9812..d0215144a 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -21,7 +21,7 @@
     import { hasOnboardingDismissed } from '$lib/helpers/onboarding';
     import { isSidebarOpen, noWidthTransition } from '$lib/stores/sidebar';
     import { page } from '$app/state';
-    import { page as pageStore } from '$lib/stores/page';
+    import { page as pageStore } from '$app/stores';
     import { BillingPlanGroup, type Models } from '@appwrite.io/console';
     import { getSidebarState, isInDatabasesRoute, updateSidebarState } from '$lib/helpers/sidebar';
     import { isTabletViewport } from '$lib/stores/viewport';
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index 01d5a8030..289605db8 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -1,5 +1,5 @@
 import { resolve } from '$app/paths';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import { goto } from '$app/navigation';
 import { browser } from '$app/environment';
 import { Click, trackEvent } from '$lib/actions/analytics';
diff --git a/src/lib/stores/database.ts b/src/lib/stores/database.ts
index 74e15c811..d0d7e160f 100644
--- a/src/lib/stores/database.ts
+++ b/src/lib/stores/database.ts
@@ -1,5 +1,5 @@
 import { derived, get, writable } from 'svelte/store';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import { type Models, Query } from '@appwrite.io/console';
 import { sdk } from '$lib/stores/sdk';
 import { headerAlert } from '$lib/stores/headerAlert';
diff --git a/src/lib/stores/organization.ts b/src/lib/stores/organization.ts
index 9ca9f8f44..8503d8f63 100644
--- a/src/lib/stores/organization.ts
+++ b/src/lib/stores/organization.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import { sdk } from '$lib/stores/sdk';
 import { isCloud } from '$lib/system';
 import { derived, writable } from 'svelte/store';
diff --git a/src/lib/stores/page.ts b/src/lib/stores/page.ts
deleted file mode 100644
index da4633c00..000000000
--- a/src/lib/stores/page.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { page } from '$app/stores';
diff --git a/src/lib/stores/roles.ts b/src/lib/stores/roles.ts
index 989387b25..b3db98272 100644
--- a/src/lib/stores/roles.ts
+++ b/src/lib/stores/roles.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import { derived } from 'svelte/store';
 
 export const roles = derived(page, ($page) => ($page.data?.roles ?? []) as string[]);
diff --git a/src/lib/stores/specifications.ts b/src/lib/stores/specifications.ts
index 3b404e71c..85cf239f8 100644
--- a/src/lib/stores/specifications.ts
+++ b/src/lib/stores/specifications.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 import { derived } from 'svelte/store';
 
diff --git a/src/lib/stores/user.ts b/src/lib/stores/user.ts
index 0ada0f913..496da7952 100644
--- a/src/lib/stores/user.ts
+++ b/src/lib/stores/user.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import { derived } from 'svelte/store';
 import type { Models } from '@appwrite.io/console';
 import { browser } from '$app/environment';
diff --git a/src/lib/stores/vcs.ts b/src/lib/stores/vcs.ts
index 7ef13349d..fd79c333f 100644
--- a/src/lib/stores/vcs.ts
+++ b/src/lib/stores/vcs.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 import { derived, writable } from 'svelte/store';
 
diff --git a/src/routes/(console)/account/sessions/+page.svelte b/src/routes/(console)/account/sessions/+page.svelte
index 3c39990de..30d1e7829 100644
--- a/src/routes/(console)/account/sessions/+page.svelte
+++ b/src/routes/(console)/account/sessions/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { page as pageStore } from '$lib/stores/page';
+    import { page as pageStore } from '$app/stores';
     import { goto, invalidate } from '$app/navigation';
     import { base } from '$app/paths';
     import { Submit, trackEvent } from '$lib/actions/analytics';
diff --git a/src/routes/(console)/account/store.ts b/src/routes/(console)/account/store.ts
index 742ee80b5..362054d6f 100644
--- a/src/routes/(console)/account/store.ts
+++ b/src/routes/(console)/account/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import { derived } from 'svelte/store';
 import type { Models } from '@appwrite.io/console';
 
diff --git a/src/routes/(console)/organization-[organization]/billing/store.ts b/src/routes/(console)/organization-[organization]/billing/store.ts
index a6423b9f0..e11b69515 100644
--- a/src/routes/(console)/organization-[organization]/billing/store.ts
+++ b/src/routes/(console)/organization-[organization]/billing/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import { derived, writable } from 'svelte/store';
 import type { Models } from '@appwrite.io/console';
 import type { WizardStepsType } from '$lib/layout/wizardWithSteps.svelte';
diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts
index 6ff89ead2..a8c38a8b9 100644
--- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts
+++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Column } from '$lib/helpers/types';
 import type { Models } from '@appwrite.io/console';
 import { derived, writable } from 'svelte/store';
diff --git a/src/routes/(console)/organization-[organization]/store.ts b/src/routes/(console)/organization-[organization]/store.ts
index 1c1f35759..cb181a4f9 100644
--- a/src/routes/(console)/organization-[organization]/store.ts
+++ b/src/routes/(console)/organization-[organization]/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import { derived } from 'svelte/store';
 import { sdk } from '$lib/stores/sdk';
 import type { Models } from '@appwrite.io/console';
diff --git a/src/routes/(console)/project-[region]-[project]/auth/store.ts b/src/routes/(console)/project-[region]-[project]/auth/store.ts
index b28163222..ae7e544db 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 import { derived } from 'svelte/store';
 
diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/store.ts b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/store.ts
index 1a46a0882..4da496a1d 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/teams/team-[team]/store.ts
@@ -1,5 +1,5 @@
 import { derived } from 'svelte/store';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 
 export const team = derived(
diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/store.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/store.ts
index 86468c8db..909a293de 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/store.ts
@@ -1,5 +1,5 @@
 import { derived } from 'svelte/store';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 
 export const user = derived(
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts
index dadf9a645..be4fcf1fb 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Column } from '$lib/helpers/types';
 import type { SortState } from '$database/store';
 import { derived, writable } from 'svelte/store';
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts
index 600355099..3928be3f5 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Column, ColumnType } from '$lib/helpers/types';
 import type { Models } from '@appwrite.io/console';
 import { derived, writable } from 'svelte/store';
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/store.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/store.ts
index ef4901932..337a6b456 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 import { derived } from 'svelte/store';
 
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/store.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/store.ts
index e3fd63508..42bf293ce 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/store.ts
@@ -2,7 +2,7 @@ import { derived, get, writable, type Writable } from 'svelte/store';
 import { DeploymentDownloadType, type Models } from '@appwrite.io/console';
 import type { Column } from '$lib/helpers/types';
 import { sdk } from '$lib/stores/sdk';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 
 export const func = derived(page, ($page) => $page.data.function as Models.Function);
 export const deploymentList = derived(
diff --git a/src/routes/(console)/project-[region]-[project]/functions/store.ts b/src/routes/(console)/project-[region]-[project]/functions/store.ts
index 1856b7eb1..17fa04afa 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import { derived } from 'svelte/store';
 import type { Models } from '@appwrite.io/console';
 
diff --git a/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/store.ts b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/store.ts
index 88ea71665..56908d3fa 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 import { derived } from 'svelte/store';
 
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/store.ts
index 823b1e7b7..6cbce74b9 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/message-[message]/store.ts
@@ -1,5 +1,5 @@
 import { derived } from 'svelte/store';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 
 export const message = derived(
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/store.ts
index 7b30d1ba6..d4211320e 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/provider-[provider]/store.ts
@@ -1,5 +1,5 @@
 import { derived } from 'svelte/store';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 
 export const provider = derived(page, ($page) => $page.data.provider as Models.Provider);
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/store.ts b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/store.ts
index f38ab7b33..dec5bf146 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/store.ts
@@ -1,5 +1,5 @@
 import { derived } from 'svelte/store';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 
 export const topic = derived(
diff --git a/src/routes/(console)/project-[region]-[project]/overview/api-keys/[key]/store.ts b/src/routes/(console)/project-[region]-[project]/overview/api-keys/[key]/store.ts
index 414c1c1a0..5a1a9f936 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/api-keys/[key]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/overview/api-keys/[key]/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import { derived } from 'svelte/store';
 import type { Models } from '@appwrite.io/console';
 
diff --git a/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/store.ts b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/store.ts
index aab27689a..baf2031a7 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/overview/dev-keys/[key]/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import { derived } from 'svelte/store';
 import type { Models } from '@appwrite.io/console';
 
diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/store.ts b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/store.ts
index 2b91f53d2..fda85f3a6 100644
--- a/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/store.ts
@@ -1,5 +1,5 @@
 import { derived } from 'svelte/store';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { AnyPlatform } from '$lib/helpers/platform';
 
 export const platform = derived(page, ($page) => $page.data.platform as AnyPlatform);
diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/store.ts b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/store.ts
index 9cff2079f..1937e6130 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/store.ts
@@ -1,5 +1,5 @@
 import { derived } from 'svelte/store';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 
 export const webhook = derived(page, ($page) => $page.data.webhook as Models.Webhook);
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/store.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/store.ts
index ef4901932..337a6b456 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 import { derived } from 'svelte/store';
 
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/store.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/store.ts
index f474ef2ca..c761e1733 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 import { derived } from 'svelte/store';
 
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts
index 39a57cf27..310b8ecf3 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/store.ts
@@ -1,5 +1,5 @@
 import { derived, writable } from 'svelte/store';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 import type { Column } from '$lib/helpers/types';
 
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/store.ts b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/store.ts
index 89e2bcf49..55b0aa180 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/store.ts
@@ -1,5 +1,5 @@
 import { derived } from 'svelte/store';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { Models } from '@appwrite.io/console';
 
 export const bucket = derived(page, ($page) => $page.data.bucket as Models.Bucket);
diff --git a/src/routes/(console)/project-[region]-[project]/store.ts b/src/routes/(console)/project-[region]-[project]/store.ts
index c20de7369..7ec5305b2 100644
--- a/src/routes/(console)/project-[region]-[project]/store.ts
+++ b/src/routes/(console)/project-[region]-[project]/store.ts
@@ -2,7 +2,7 @@ import type { Models } from '@appwrite.io/console';
 import type { BarSeriesOption } from 'echarts/charts';
 import { derived, get, writable } from 'svelte/store';
 import { regions } from '$lib/stores/organization';
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import CursorIcon from './overview/components/CursorIcon.svelte';
 import ClaudeIcon from './overview/components/ClaudeIcon.svelte';
 import VSCodeIcon from './overview/components/VSCodeIcon.svelte';
diff --git a/src/routes/(console)/store.ts b/src/routes/(console)/store.ts
index 66982a397..a21c99451 100644
--- a/src/routes/(console)/store.ts
+++ b/src/routes/(console)/store.ts
@@ -1,4 +1,4 @@
-import { page } from '$lib/stores/page';
+import { page } from '$app/stores';
 import type { HeaderAlert } from '$lib/stores/headerAlert';
 import type { Models } from '@appwrite.io/console';
 import { derived, writable } from 'svelte/store';