diff --git a/src/lib/components/billing/planSelection.svelte b/src/lib/components/billing/planSelection.svelte
index a4a290367..381832bfe 100644
--- a/src/lib/components/billing/planSelection.svelte
+++ b/src/lib/components/billing/planSelection.svelte
@@ -8,7 +8,6 @@
 
     export let billingPlan: Tier;
     export let isNewOrg = false;
-    export let anyOrgFree = false;
     export let selfService = true;
 
     $: freePlan = $plansInfo.get(BillingPlan.FREE);
diff --git a/src/routes/(console)/project-[region]-[project]/auth/templates/email2FATemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/email2FATemplate.svelte
index cc93ca6c3..536a1aa28 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/templates/email2FATemplate.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/templates/email2FATemplate.svelte
@@ -8,11 +8,12 @@
     import { Id } from '$lib/components';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Layout, Card } from '@appwrite.io/pink-svelte';
+    import { EmailTemplateLocale, EmailTemplateType } from '@appwrite.io/console';
 
     export let loading = false;
 
-    let locale = 'en';
     let isUpdating = false;
+    let locale = EmailTemplateLocale.En;
     const projectId = page.params.project;
 
     async function onLocaleChange() {
@@ -20,10 +21,14 @@
             isUpdating = true;
         }, 1000);
         try {
-            const template = await loadEmailTemplate(projectId, 'mfaChallenge', locale);
+            const template = await loadEmailTemplate(
+                projectId,
+                EmailTemplateType.Mfachallenge,
+                locale
+            );
             emailTemplate.set(template);
             $baseEmailTemplate = { ...$emailTemplate };
-            trackEvent(Submit.EmailChangeLocale, { locale, type: 'mfaChallenge' });
+            trackEvent(Submit.EmailChangeLocale, { locale, type: EmailTemplateType.Mfachallenge });
         } catch (error) {
             trackError(error, Submit.EmailChangeLocale);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/templates/emailInviteTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailInviteTemplate.svelte
index 262deda4d..f723da9cd 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/templates/emailInviteTemplate.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/templates/emailInviteTemplate.svelte
@@ -8,11 +8,12 @@
     import { Id } from '$lib/components';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Layout, Card } from '@appwrite.io/pink-svelte';
+    import { EmailTemplateLocale, EmailTemplateType } from '@appwrite.io/console';
 
     export let loading = false;
 
-    let locale = 'en';
     let isUpdating = false;
+    let locale = EmailTemplateLocale.En;
     const projectId = page.params.project;
 
     async function onLocaleChange() {
@@ -20,10 +21,14 @@
             isUpdating = true;
         }, 1000);
         try {
-            const template = await loadEmailTemplate(projectId, 'invitation', locale);
+            const template = await loadEmailTemplate(
+                projectId,
+                EmailTemplateType.Invitation,
+                locale
+            );
             emailTemplate.set(template);
             $baseEmailTemplate = { ...$emailTemplate };
-            trackEvent(Submit.EmailChangeLocale, { locale, type: 'invitation' });
+            trackEvent(Submit.EmailChangeLocale, { locale, type: EmailTemplateType.Invitation });
         } catch (error) {
             trackError(error, Submit.EmailChangeLocale);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/templates/emailMagicUrlTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailMagicUrlTemplate.svelte
index 9f4453359..1e98218db 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/templates/emailMagicUrlTemplate.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/templates/emailMagicUrlTemplate.svelte
@@ -8,11 +8,12 @@
     import { Id } from '$lib/components';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Layout, Card } from '@appwrite.io/pink-svelte';
+    import { EmailTemplateLocale, EmailTemplateType } from '@appwrite.io/console';
 
     export let loading = false;
 
-    let locale = 'en';
     let isUpdating = false;
+    let locale = EmailTemplateLocale.En;
     const projectId = page.params.project;
 
     async function onLocaleChange() {
@@ -20,10 +21,14 @@
             isUpdating = true;
         }, 1000);
         try {
-            const template = await loadEmailTemplate(projectId, 'magicSession', locale);
+            const template = await loadEmailTemplate(
+                projectId,
+                EmailTemplateType.Magicsession,
+                locale
+            );
             emailTemplate.set(template);
             $baseEmailTemplate = { ...$emailTemplate };
-            trackEvent(Submit.EmailChangeLocale, { locale, type: 'magicSession' });
+            trackEvent(Submit.EmailChangeLocale, { locale, type: EmailTemplateType.Magicsession });
         } catch (error) {
             trackError(error, Submit.EmailChangeLocale);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/templates/emailOtpSessionTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailOtpSessionTemplate.svelte
index fd62f4ae9..07e6b1bc6 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/templates/emailOtpSessionTemplate.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/templates/emailOtpSessionTemplate.svelte
@@ -8,11 +8,12 @@
     import { Id } from '$lib/components';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Layout, Card } from '@appwrite.io/pink-svelte';
+    import { EmailTemplateLocale, EmailTemplateType } from '@appwrite.io/console';
 
     export let loading = false;
 
-    let locale = 'en';
     let isUpdating = false;
+    let locale = EmailTemplateLocale.En;
     const projectId = page.params.project;
 
     async function onLocaleChange() {
@@ -20,10 +21,14 @@
             isUpdating = true;
         }, 1000);
         try {
-            const template = await loadEmailTemplate(projectId, 'otpSession', locale);
+            const template = await loadEmailTemplate(
+                projectId,
+                EmailTemplateType.Otpsession,
+                locale
+            );
             emailTemplate.set(template);
             $baseEmailTemplate = { ...$emailTemplate };
-            trackEvent(Submit.EmailChangeLocale, { locale, type: 'otpSession' });
+            trackEvent(Submit.EmailChangeLocale, { locale, type: EmailTemplateType.Otpsession });
         } catch (error) {
             trackError(error, Submit.EmailChangeLocale);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/templates/emailRecoveryTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailRecoveryTemplate.svelte
index 9230a8809..23597970f 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/templates/emailRecoveryTemplate.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/templates/emailRecoveryTemplate.svelte
@@ -8,11 +8,12 @@
     import { Id } from '$lib/components';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Layout, Card } from '@appwrite.io/pink-svelte';
+    import { EmailTemplateLocale, EmailTemplateType } from '@appwrite.io/console';
 
     export let loading = false;
 
-    let locale = 'en';
     let isUpdating = false;
+    let locale = EmailTemplateLocale.En;
     const projectId = page.params.project;
 
     async function onLocaleChange() {
@@ -20,10 +21,10 @@
             isUpdating = true;
         }, 1000);
         try {
-            const template = await loadEmailTemplate(projectId, 'recovery', locale);
+            const template = await loadEmailTemplate(projectId, EmailTemplateType.Recovery, locale);
             emailTemplate.set(template);
             $baseEmailTemplate = { ...$emailTemplate };
-            trackEvent(Submit.EmailChangeLocale, { locale, type: 'recovery' });
+            trackEvent(Submit.EmailChangeLocale, { locale, type: EmailTemplateType.Recovery });
         } catch (error) {
             trackError(error, Submit.EmailChangeLocale);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/templates/emailSessionAlertTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailSessionAlertTemplate.svelte
index e9e67c156..ebe907550 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/templates/emailSessionAlertTemplate.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/templates/emailSessionAlertTemplate.svelte
@@ -8,11 +8,12 @@
     import { Id } from '$lib/components';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Layout, Card } from '@appwrite.io/pink-svelte';
+    import { EmailTemplateLocale, EmailTemplateType } from '@appwrite.io/console';
 
     export let loading = false;
 
-    let locale = 'en';
     let isUpdating = false;
+    let locale = EmailTemplateLocale.En;
     const projectId = page.params.project;
 
     async function onLocaleChange() {
@@ -20,10 +21,14 @@
             isUpdating = true;
         }, 1000);
         try {
-            const template = await loadEmailTemplate(projectId, 'sessionalert', locale);
+            const template = await loadEmailTemplate(
+                projectId,
+                EmailTemplateType.Sessionalert,
+                locale
+            );
             emailTemplate.set(template);
             $baseEmailTemplate = { ...$emailTemplate };
-            trackEvent(Submit.EmailChangeLocale, { locale, type: 'sessionalert' });
+            trackEvent(Submit.EmailChangeLocale, { locale, type: EmailTemplateType.Sessionalert });
         } catch (error) {
             trackError(error, Submit.EmailChangeLocale);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/templates/emailVerificationTemplate.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/emailVerificationTemplate.svelte
index 1c3a8e547..54f257fe4 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/templates/emailVerificationTemplate.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/templates/emailVerificationTemplate.svelte
@@ -8,11 +8,12 @@
     import { addNotification } from '$lib/stores/notifications';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { Layout, Card } from '@appwrite.io/pink-svelte';
+    import { EmailTemplateLocale, EmailTemplateType } from '@appwrite.io/console';
 
     export let loading = false;
 
-    let locale = 'en';
     let isUpdating = false;
+    let locale = EmailTemplateLocale.En;
     const projectId = page.params.project;
 
     async function onLocaleChange() {
@@ -20,10 +21,14 @@
             isUpdating = true;
         }, 1000);
         try {
-            const template = await loadEmailTemplate(projectId, 'verification', locale);
+            const template = await loadEmailTemplate(
+                projectId,
+                EmailTemplateType.Verification,
+                locale
+            );
             emailTemplate.set(template);
             $baseEmailTemplate = { ...$emailTemplate };
-            trackEvent(Submit.EmailChangeLocale, { locale, type: 'verification' });
+            trackEvent(Submit.EmailChangeLocale, { locale, type: EmailTemplateType.Verification });
         } catch (error) {
             trackError(error, Submit.EmailChangeLocale);
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/auth/templates/resetEmail.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/resetEmail.svelte
index 347b081db..891f1abe6 100644
--- a/src/routes/(console)/project-[region]-[project]/auth/templates/resetEmail.svelte
+++ b/src/routes/(console)/project-[region]-[project]/auth/templates/resetEmail.svelte
@@ -23,8 +23,8 @@
             );
             $emailTemplate = await loadEmailTemplate(
                 $project.$id,
-                $emailTemplate.type,
-                $emailTemplate.locale
+                $emailTemplate.type as EmailTemplateType,
+                $emailTemplate.locale as EmailTemplateLocale
             );
             $baseEmailTemplate = { ...$emailTemplate };
             addNotification({
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
index 0567a871c..c80b8007b 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.ts
@@ -6,12 +6,10 @@ export const load: PageLoad = async ({ params, depends, parent }) => {
     const { function: func } = await parent();
     depends(Dependencies.DEPLOYMENT);
 
-    const deployment = await sdk
-        .forProject(params.region, params.project)
-        .functions.getDeployment({
-            functionId: params.function,
-            deploymentId: params.deployment
-        });
+    const deployment = await sdk.forProject(params.region, params.project).functions.getDeployment({
+        functionId: params.function,
+        deploymentId: params.deployment
+    });
 
     return {
         func,
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts
index f9c2ecb50..a62c7f29c 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts
@@ -9,14 +9,9 @@ export const load = async ({ depends, params, parent }) => {
     depends(Dependencies.DOMAINS);
 
     const [rules, domains] = await Promise.all([
-        sdk
-            .forProject(params.region, params.project)
-            .proxy.listRules({
-                queries: [
-                    Query.equal('type', RuleType.API),
-                    Query.equal('trigger', RuleTrigger.MANUAL)
-                ]
-            }),
+        sdk.forProject(params.region, params.project).proxy.listRules({
+            queries: [Query.equal('type', RuleType.API), Query.equal('trigger', RuleTrigger.MANUAL)]
+        }),
         isCloud
             ? sdk.forConsole.domains.list({ queries: [Query.equal('teamId', organization.$id)] })
             : Promise.resolve(null)
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
index e0899259a..1af6eb759 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
@@ -22,17 +22,15 @@ export const load = async ({ params, depends, parent }) => {
                 Query.orderDesc('')
             ]
         }),
-        sdk
-            .forProject(params.region, params.project)
-            .proxy.listRules({
-                queries: [
-                    Query.equal('type', RuleType.DEPLOYMENT),
-                    Query.equal('deploymentResourceType', DeploymentResourceType.SITE),
-                    Query.equal('deploymentResourceId', site.$id),
-                    Query.equal('deploymentId', site.deploymentId),
-                    Query.orderDesc('')
-                ]
-            })
+        sdk.forProject(params.region, params.project).proxy.listRules({
+            queries: [
+                Query.equal('type', RuleType.DEPLOYMENT),
+                Query.equal('deploymentResourceType', DeploymentResourceType.SITE),
+                Query.equal('deploymentResourceId', site.$id),
+                Query.equal('deploymentId', site.deploymentId),
+                Query.orderDesc('')
+            ]
+        })
     ]);
 
     const deployment = deploymentList?.total
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts
index 91c30acbf..f54e98097 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts
@@ -30,12 +30,10 @@ export const load = async ({ parent, depends, params }) => {
         installations,
         branches:
             site?.installationId && site?.providerRepositoryId
-                ? await sdk
-                      .forProject(params.region, params.project)
-                      .vcs.listRepositoryBranches({
-                          installationId: site.installationId,
-                          providerRepositoryId: site.providerRepositoryId
-                      })
+                ? await sdk.forProject(params.region, params.project).vcs.listRepositoryBranches({
+                      installationId: site.installationId,
+                      providerRepositoryId: site.providerRepositoryId
+                  })
                 : undefined
     };
 };