diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 60baa93de..e074b7fb8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ We would ❤️ for you to contribute to Appwrite and help make it better! We wa
 
 ## How to Start?
 
-If you are worried about or don’t know where to start, check out the next section that explains what kind of help is needed and how you can get involved. You can reach out with any questions on our [Discord](https://appwrite.io/discord) server. You can also submit an issue and a maintainer can guide you!
+If you are worried about or don't know where to start, check out the next section that explains what kind of help is needed and how you can get involved. You can reach out with any questions on our [Discord](https://appwrite.io/discord) server. You can also submit an issue and a maintainer can guide you!
 
 ## Repo Structure
 
@@ -242,7 +242,7 @@ When blogging, speaking about, or creating tutorials about one of Appwrite's man
 
 ### Presenting at Meetups
 
-Presenting at meetups and conferences about your Appwrite projects is another excellent way to get the word out about Appwrite. Your unique challenges and successes in building things with Appwrite can provide great speaking material. We’d love to review your talk abstract/CFP, so get in touch with us if you’d like some help!
+Presenting at meetups and conferences about your Appwrite projects is another excellent way to get the word out about Appwrite. Your unique challenges and successes in building things with Appwrite can provide great speaking material. We'd love to review your talk abstract/CFP, so get in touch with us if you'd like some help!
 
 ### Sending Feedback & Reporting Bugs
 
diff --git a/README.md b/README.md
index d9365176b..e37369791 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Console 2.0 is designed to be accessible, from design to code. Console 2.0 is al
 
 ### Scalability and Collaboration
 
-The new console is more maintainable and welcoming to community contributions. Console 2.0 is built using Svelte instead of our own library. It’s better documented and well-known, making it easier for developers to contribute to Appwrite.
+The new console is more maintainable and welcoming to community contributions. Console 2.0 is built using Svelte instead of our own library. It's better documented and well-known, making it easier for developers to contribute to Appwrite.
 
 ## Contributing
 
diff --git a/package-lock.json b/package-lock.json
index ace5f6d0d..590e07f9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
             "dependencies": {
                 "@analytics/google-analytics": "^1.0.5",
                 "@analytics/google-tag-manager": "^0.5.3",
-                "@appwrite.io/console": "npm:matej-appwrite-console@7.1.130",
+                "@appwrite.io/console": "^0.3.0",
                 "@appwrite.io/pink": "0.1.0-next.8",
                 "@appwrite.io/pink-icons": "^0.1.0-next.8",
                 "@popperjs/core": "^2.11.6",
@@ -169,10 +169,9 @@
             "integrity": "sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg=="
         },
         "node_modules/@appwrite.io/console": {
-            "name": "matej-appwrite-console",
-            "version": "7.1.130",
-            "resolved": "https://registry.npmjs.org/matej-appwrite-console/-/matej-appwrite-console-7.1.130.tgz",
-            "integrity": "sha512-XsaGxuUNznKKiQpbYAy7VYtj5f0CitrMcIh+9UiHzI0dVXe4ck8humDv6l8XVFp0aQZWxc6RfiPuHo9oreEKuw==",
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.3.0.tgz",
+            "integrity": "sha512-XHKQHirzQliXoDpMLakSdXwpq9aPoeTABNhW8Z7MK3p6oBfp2gMplDD43Fbd91JREXoJ+RG8okX0z0nIc6hDiQ==",
             "dependencies": {
                 "cross-fetch": "3.1.5",
                 "isomorphic-form-data": "2.0.0"
@@ -8985,9 +8984,9 @@
             "integrity": "sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg=="
         },
         "@appwrite.io/console": {
-            "version": "npm:matej-appwrite-console@7.1.130",
-            "resolved": "https://registry.npmjs.org/matej-appwrite-console/-/matej-appwrite-console-7.1.130.tgz",
-            "integrity": "sha512-XsaGxuUNznKKiQpbYAy7VYtj5f0CitrMcIh+9UiHzI0dVXe4ck8humDv6l8XVFp0aQZWxc6RfiPuHo9oreEKuw==",
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.3.0.tgz",
+            "integrity": "sha512-XHKQHirzQliXoDpMLakSdXwpq9aPoeTABNhW8Z7MK3p6oBfp2gMplDD43Fbd91JREXoJ+RG8okX0z0nIc6hDiQ==",
             "requires": {
                 "cross-fetch": "3.1.5",
                 "isomorphic-form-data": "2.0.0"
diff --git a/package.json b/package.json
index e38f65dc4..27292b7bb 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "dependencies": {
         "@analytics/google-analytics": "^1.0.5",
         "@analytics/google-tag-manager": "^0.5.3",
-        "@appwrite.io/console": "npm:matej-appwrite-console@7.1.130",
+        "@appwrite.io/console": "^0.3.0",
         "@appwrite.io/pink": "0.1.0-next.8",
         "@appwrite.io/pink-icons": "^0.1.0-next.8",
         "@popperjs/core": "^2.11.6",
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index b73ecbbb9..a2107d03c 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -40,7 +40,9 @@ export enum Dependencies {
     WEBHOOK = 'dependency:webhook',
     WEBHOOKS = 'dependency:webhooks',
     MIGRATIONS = 'dependency:migrations',
-    COLLECTIONS = 'dependency:collections'
+    COLLECTIONS = 'dependency:collections',
+    RUNTIMES = 'dependency:runtimes',
+    CONSOLE_VARIABLES = 'dependency:console_variables'
 }
 
 export const scopes: {
diff --git a/src/lib/helpers/debounce.ts b/src/lib/helpers/debounce.ts
index afb93f4a2..6a36b4e47 100644
--- a/src/lib/helpers/debounce.ts
+++ b/src/lib/helpers/debounce.ts
@@ -1,6 +1,6 @@
-export function debounce<F extends (...params: any[]) => void>(fn: F, delay: number) {
+export function debounce<F extends (...params: unknown[]) => void>(fn: F, delay: number) {
     let timeoutID: ReturnType<typeof setTimeout> = null;
-    const debounceFn = function (this: any, ...args: any[]) {
+    const debounceFn = function (this: unknown, ...args: unknown[]) {
         clearTimeout(timeoutID);
         timeoutID = window.setTimeout(() => fn.apply(this, args), delay) as unknown as ReturnType<
             typeof setTimeout
diff --git a/src/lib/helpers/object.ts b/src/lib/helpers/object.ts
index fb09d2ab5..0a901aed3 100644
--- a/src/lib/helpers/object.ts
+++ b/src/lib/helpers/object.ts
@@ -45,7 +45,7 @@ export function deepMap<T, U>(
     return result;
 }
 
-export function parseIfString(value: unknown): any {
+export function parseIfString(value: unknown): unknown {
     if (typeof value === 'string') {
         try {
             return JSON.parse(value);
diff --git a/src/lib/helpers/project.ts b/src/lib/helpers/project.ts
index ff8f887b0..a8a88cd3f 100644
--- a/src/lib/helpers/project.ts
+++ b/src/lib/helpers/project.ts
@@ -1,5 +1,5 @@
 export function getProjectId() {
-    const pathname = window.location.pathname;
+    const pathname = window.location.pathname + '/';
     const projectMatch = pathname.match(/\/project-(.*?)\//);
     return projectMatch?.[1] || null;
 }
diff --git a/src/lib/helpers/stores.ts b/src/lib/helpers/stores.ts
index 509693a9e..13a63437d 100644
--- a/src/lib/helpers/stores.ts
+++ b/src/lib/helpers/stores.ts
@@ -9,7 +9,7 @@ import { deepClone, objectEntries } from './object';
  *
  * @export
  */
-export function createConservative<Obj extends Record<string, any>>(obj: Obj) {
+export function createConservative<Obj extends Record<string, unknown>>(obj: Obj) {
     const stores = Object.fromEntries(
         objectEntries(obj).map(([key, value]) => [key, writable(value)])
     ) as {
diff --git a/src/lib/pages/domains/wizard/step1.svelte b/src/lib/pages/domains/wizard/step1.svelte
index 6c37353c2..5b21ca35b 100644
--- a/src/lib/pages/domains/wizard/step1.svelte
+++ b/src/lib/pages/domains/wizard/step1.svelte
@@ -9,6 +9,7 @@
     import { onMount } from 'svelte';
     import { ProxyTypes } from '../index.svelte';
     import { domain, typeStore } from './store';
+    import { consoleVariables } from '$routes/console/store';
 
     let error = null;
     let isDomainsEnabled = false;
@@ -17,9 +18,8 @@
         if (!isSelfHosted) {
             return;
         }
-        const vars = await sdk.forConsole.console.variables();
-        //@ts-expect-error needs an sdk release
-        isDomainsEnabled = vars?._APP_DOMAIN_ENABLED === true;
+
+        isDomainsEnabled = (await $consoleVariables)?._APP_DOMAIN_ENABLED === true;
     });
 
     async function createDomain() {
@@ -78,8 +78,12 @@
             To add a domain to a locally hosted Appwrite project, you must first configure your server
             domain.
             <svelte:fragment slot="buttons">
-                <!-- TODO: add link to docs -->
-                <Button href="#/" external text>Learn more</Button>
+                <Button
+                    href="https://appwrite.io/docs/environment-variables#vcs_(version_control_system)"
+                    external
+                    text>
+                    Learn more
+                </Button>
             </svelte:fragment>
         </Alert>
     {/if}
diff --git a/src/lib/stores/marketplace.ts b/src/lib/stores/marketplace.ts
index d38c3d679..3c76be73a 100644
--- a/src/lib/stores/marketplace.ts
+++ b/src/lib/stores/marketplace.ts
@@ -1,4 +1,4 @@
-export const marketplace = [
+export const marketplace: MarketplaceTemplate[] = [
     {
         icon: 'icon-lightning-bolt',
         id: 'starter',
@@ -9,7 +9,7 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['Starter'],
         runtimes: [
             {
                 name: 'node-18.0',
@@ -66,13 +66,31 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['AI'],
         runtimes: [
             {
                 name: 'node-18.0',
                 commands: 'npm install',
                 entrypoint: 'src/main.js',
                 providerRootDirectory: 'node/prompt-chatgpt'
+            },
+            {
+                name: 'python-3.9',
+                commands: 'pip install -r requirements.txt',
+                entrypoint: 'src/main.py',
+                providerRootDirectory: 'python/prompt_chatgpt'
+            },
+            {
+                name: 'php-8.0',
+                commands: 'composer install',
+                entrypoint: 'src/index.php',
+                providerRootDirectory: 'php/prompt-chatgpt'
+            },
+            {
+                name: 'dart-2.17',
+                commands: 'dart pub get',
+                entrypoint: 'lib/main.dart',
+                providerRootDirectory: 'dart/prompt_chatgpt'
             }
         ],
         instructions: `For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/prompt-chatgpt">file</a>.`,
@@ -106,13 +124,19 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['Messaging'],
         runtimes: [
             {
                 name: 'node-18.0',
                 commands: 'npm install && npm run setup',
-                entrypoint: 'src/main.js',
+                entrypoint: 'src/main.js && npm run setup',
                 providerRootDirectory: 'node/discord-command-bot'
+            },
+            {
+                name: 'python-3.9',
+                commands: 'pip install -r requirements.txt && python src/setup.py',
+                entrypoint: 'src/main.py',
+                providerRootDirectory: 'python/discord_command_bot'
             }
         ],
         instructions: `For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/discord-command-bot">file</a>.`,
@@ -139,7 +163,7 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['AI'],
         runtimes: [
             {
                 name: 'node-18.0',
@@ -173,13 +197,25 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['AI'],
         runtimes: [
             {
                 name: 'node-18.0',
                 commands: 'npm install',
                 entrypoint: 'src/main.js',
                 providerRootDirectory: 'node/censor-with-redact'
+            },
+            {
+                name: 'python-3.9',
+                commands: 'pip install -r requirements.txt',
+                entrypoint: 'src/main.py',
+                providerRootDirectory: 'python/censor_with_redact'
+            },
+            {
+                name: 'dart-2.17',
+                commands: 'dart pub get',
+                entrypoint: 'lib/main.dart',
+                providerRootDirectory: 'dart/censor_with_redact'
             }
         ],
         instructions: `For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/censor-with-redact">file</a>.`,
@@ -206,7 +242,7 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['Utilities'],
         runtimes: [
             {
                 name: 'node-18.0',
@@ -232,7 +268,7 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['Dev Tools'],
         runtimes: [
             {
                 name: 'node-18.0',
@@ -272,7 +308,7 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['Utilities'],
         runtimes: [
             {
                 name: 'node-18.0',
@@ -314,6 +350,13 @@ export const marketplace = [
                 value: 'urls',
                 placeholder: 'urls',
                 required: false
+            },
+            {
+                name: 'SHORT_BASE_URL',
+                description: `The domain to use for the short URLs. You can use your functions subdomain or a custom domain.`,
+                value: '',
+                placeholder: 'https://shortdomain.io',
+                required: true
             }
         ]
     },
@@ -326,13 +369,25 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['Databases'],
         runtimes: [
             {
                 name: 'node-18.0',
                 commands: 'npm install',
                 entrypoint: 'src/main.js',
                 providerRootDirectory: 'node/sync-with-algolia'
+            },
+            {
+                name: 'python-3.9',
+                commands: 'pip install -r requirements.txt',
+                entrypoint: 'src/main.py',
+                providerRootDirectory: 'python/sync_with_algolia'
+            },
+            {
+                name: 'php-8.0',
+                commands: 'composer install',
+                entrypoint: 'src/index.php',
+                providerRootDirectory: 'php/sync-with-algolia'
             }
         ],
         instructions: `For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/sync-with-algolia">file</a>.`,
@@ -369,7 +424,7 @@ export const marketplace = [
             {
                 name: 'ALGOLIA_INDEX_ID',
                 description: `The ID of the index in Algolia where the documents are to be synced. <a class="u-bold" target="_blank" href="https://www.algolia.com/doc/api-client/methods/indexing/">Learn more</a>.`,
-                placeholder: 'appwrite_index',
+                placeholder: 'my_index',
                 required: true
             },
             {
@@ -396,7 +451,7 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['Databases'],
         runtimes: [
             {
                 name: 'node-18.0',
@@ -472,7 +527,7 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['Messaging'],
         runtimes: [
             {
                 name: 'node-18.0',
@@ -523,7 +578,7 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['Messaging'],
         runtimes: [
             {
                 name: 'node-18.0',
@@ -574,13 +629,25 @@ export const marketplace = [
         events: [],
         cron: '',
         timeout: 15,
-        usecases: ['placeholder'],
+        usecases: ['Utilities'],
         runtimes: [
             {
                 name: 'node-18.0',
                 commands: 'npm install',
                 entrypoint: 'src/main.js',
                 providerRootDirectory: 'node/email-contact-form'
+            },
+            {
+                name: 'python-3.9',
+                commands: 'pip install -r requirements.txt',
+                entrypoint: 'src/main.py',
+                providerRootDirectory: 'python/email_contact_form'
+            },
+            {
+                name: 'php-8.0',
+                commands: 'composer install',
+                entrypoint: 'src/index.php',
+                providerRootDirectory: 'php/email-contact-form'
             }
         ],
         instructions: `For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/email-contact-form">file</a>.`,
diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte
index f38cfa2b2..ee607e3c3 100644
--- a/src/lib/wizards/functions/cover.svelte
+++ b/src/lib/wizards/functions/cover.svelte
@@ -2,7 +2,7 @@
     import CreateTemplate from './createTemplate.svelte';
 
     export function connectTemplate(template: MarketplaceTemplate, runtime: string | null = null) {
-        const variables: any = {};
+        const variables: Record<string, string> = {};
         template.variables.forEach((variable) => {
             variables[variable.name] = variable.value ?? '';
         });
@@ -29,17 +29,19 @@
 <script lang="ts">
     import { base } from '$app/paths';
     import { AvatarGroup, Box, Heading } from '$lib/components';
-    import WizardCover from '$lib/layout/wizardCover.svelte';
     import { app } from '$lib/stores/app';
     import { wizard } from '$lib/stores/wizard';
-    import { repository, runtimes, templateConfig, template as templateStore } from './store';
+    import { repository, templateConfig, template as templateStore } from './store';
     import { marketplace, type MarketplaceTemplate } from '$lib/stores/marketplace';
+    import { Button } from '$lib/elements/forms';
+    import { page } from '$app/stores';
+    import { runtimes } from '$routes/console/project-[project]/functions/store';
+    import { trackEvent } from '$lib/actions/analytics';
     import type { Models } from '@appwrite.io/console';
+    import WizardCover from '$lib/layout/wizardCover.svelte';
     import Repositories from './components/repositories.svelte';
     import CreateManual from './createManual.svelte';
     import CreateGit from './createGit.svelte';
-    import { Button } from '$lib/elements/forms';
-    import { page } from '$app/stores';
 
     let hasInstallations: boolean;
     let selectedRepository: string;
@@ -48,6 +50,9 @@
     const templates = marketplace.filter((template) => template.id !== 'starter').slice(0, 2);
 
     function connect(event: CustomEvent<Models.ProviderRepository>) {
+        trackEvent('click_connect_repository', {
+            from: 'cover'
+        });
         repository.set(event.detail);
         wizard.start(CreateGit);
     }
@@ -109,6 +114,13 @@
                                 )}
                                 <li>
                                     <button
+                                        on:click={() => {
+                                            trackEvent('click_connect_template', {
+                                                from: 'cover',
+                                                template: quickStart.id,
+                                                runtime: runtime.name
+                                            });
+                                        }}
                                         on:click={() => connectTemplate(quickStart, runtime.name)}
                                         class="box u-width-full-line u-flex u-cross-center u-gap-8"
                                         style:--box-padding="1rem"
@@ -157,6 +169,12 @@
                             <li class="clickable-list-item">
                                 <button
                                     type="button"
+                                    on:click={() => {
+                                        trackEvent('click_connect_template', {
+                                            from: 'cover',
+                                            template: template.id
+                                        });
+                                    }}
                                     on:click={() => connectTemplate(template)}
                                     class="clickable-list-button u-width-full-line u-flex u-gap-12">
                                     <div class="avatar is-size-small" style:--p-text-size="1.25rem">
@@ -185,6 +203,11 @@
         <p class="u-margin-block-start-16">
             You can also create a function <button
                 class="link"
+                on:click={() => {
+                    trackEvent('click_create_function_manual', {
+                        from: 'cover'
+                    });
+                }}
                 on:click={() => wizard.start(CreateManual)}>manually</button>
             or using the CLI.
             <a
diff --git a/src/lib/wizards/functions/steps/details.svelte b/src/lib/wizards/functions/steps/details.svelte
index 78c0a4e5b..5d6f2b306 100644
--- a/src/lib/wizards/functions/steps/details.svelte
+++ b/src/lib/wizards/functions/steps/details.svelte
@@ -4,7 +4,8 @@
     import { InputText, InputSelect, FormList } from '$lib/elements/forms';
     import { WizardStep } from '$lib/layout';
     import { onMount } from 'svelte';
-    import { createFunction, runtimes } from '../store';
+    import { createFunction } from '../store';
+    import { runtimes } from '$routes/console/project-[project]/functions/store';
 
     let showCustomId = false;
 
diff --git a/src/lib/wizards/functions/steps/functionConfiguration.svelte b/src/lib/wizards/functions/steps/functionConfiguration.svelte
index 90cb8e702..40d994b58 100644
--- a/src/lib/wizards/functions/steps/functionConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/functionConfiguration.svelte
@@ -6,7 +6,8 @@
     import { WizardStep } from '$lib/layout';
     import { onMount } from 'svelte';
     import { sdk } from '$lib/stores/sdk';
-    import { choices, createFunction, installation, repository, runtimes } from '../store';
+    import { choices, createFunction, installation, repository } from '../store';
+    import { runtimes } from '$routes/console/project-[project]/functions/store';
 
     let showCustomId = false;
 
diff --git a/src/lib/wizards/functions/steps/templateConfiguration.svelte b/src/lib/wizards/functions/steps/templateConfiguration.svelte
index d3c1cce65..91fd29b04 100644
--- a/src/lib/wizards/functions/steps/templateConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/templateConfiguration.svelte
@@ -3,7 +3,8 @@
     import { Pill } from '$lib/elements';
     import { FormList, InputSelect, InputText } from '$lib/elements/forms';
     import { WizardStep } from '$lib/layout';
-    import { runtimes, template, templateConfig } from '../store';
+    import { runtimes } from '$routes/console/project-[project]/functions/store';
+    import { template, templateConfig } from '../store';
 
     let showCustomId = false;
 
diff --git a/src/lib/wizards/functions/store.ts b/src/lib/wizards/functions/store.ts
index afd6121c8..878fbdcc5 100644
--- a/src/lib/wizards/functions/store.ts
+++ b/src/lib/wizards/functions/store.ts
@@ -33,11 +33,6 @@ export const installations = derived(
     ($page) => $page.data.installations as Models.InstallationList
 );
 
-export const runtimes = derived(
-    page,
-    ($page) => $page.data.runtimes as Promise<Models.RuntimeList>
-);
-
 const initialCreateFunction: Partial<Models.Function> = {
     $id: null,
     name: null,
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index ffaeb4160..7c6df71e6 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -25,7 +25,7 @@
     onMount(async () => {
         if ($page.url.searchParams.has('migrate')) {
             const migrateData = $page.url.searchParams.get('migrate');
-            requestedMigration.set(parseIfString(migrateData));
+            requestedMigration.set(parseIfString(migrateData) as Record<string, string>);
         }
         /**
          * Reporting Web Vitals.
diff --git a/src/routes/console/(migration-wizard)/resource-form.svelte b/src/routes/console/(migration-wizard)/resource-form.svelte
index 769f29dc0..e8300efdb 100644
--- a/src/routes/console/(migration-wizard)/resource-form.svelte
+++ b/src/routes/console/(migration-wizard)/resource-form.svelte
@@ -15,6 +15,7 @@
         resourcesToMigrationForm
     } from '$lib/stores/migration';
     import { wizard } from '$lib/stores/wizard';
+    import type { Models } from '@appwrite.io/console';
 
     export let formData: ReturnType<typeof createMigrationFormStore>;
     export let provider: ReturnType<typeof createMigrationProviderStore>;
@@ -76,7 +77,7 @@
         $formData = resourcesToMigrationForm(resources, version);
     }
 
-    let report: any;
+    let report: Models.MigrationReport;
     $: version = report?.version || '0.0.0';
 
     let isOpen = false;
@@ -86,18 +87,16 @@
         isOpen = true;
         try {
             switch ($provider.provider) {
-                case 'appwrite': {
-                    const res = await projectSdk.migrations.getAppwriteReport(
+                case 'appwrite':
+                    report = await projectSdk.migrations.getAppwriteReport(
                         providerResources.appwrite,
                         $provider.endpoint,
                         $provider.projectID,
                         $provider.apiKey
                     );
-                    report = res;
                     break;
-                }
-                case 'supabase': {
-                    const res = await projectSdk.migrations.getSupabaseReport(
+                case 'supabase':
+                    report = await projectSdk.migrations.getSupabaseReport(
                         providerResources.supabase,
                         $provider.endpoint,
                         $provider.apiKey,
@@ -106,31 +105,25 @@
                         $provider.password,
                         $provider.port
                     );
-                    report = res;
                     break;
-                }
-                case 'firebase': {
+                case 'firebase':
                     if ($provider.projectId) {
                         // OAuth
-                        const res = await sdk.forProject.migrations.getFirebaseReportOAuth(
+                        report = await sdk.forProject.migrations.getFirebaseReportOAuth(
                             providerResources.firebase,
                             $provider.projectId
                         );
-
-                        report = res;
                     } else if ($provider.serviceAccount) {
                         // Manual auth
-                        const res = await projectSdk.migrations.getFirebaseReport(
+                        report = await projectSdk.migrations.getFirebaseReport(
                             providerResources.firebase,
                             $provider.serviceAccount
                         );
-                        report = res;
                     }
 
                     break;
-                }
-                case 'nhost': {
-                    const res = await projectSdk.migrations.getNHostReport(
+                case 'nhost':
+                    report = await projectSdk.migrations.getNHostReport(
                         providerResources.nhost,
                         $provider.subdomain,
                         $provider.region,
@@ -139,8 +132,6 @@
                         $provider.username,
                         $provider.password
                     );
-                    report = res;
-                }
             }
         } catch (e) {
             if (!isOpen) return;
diff --git a/src/routes/console/(migration-wizard)/step2.svelte b/src/routes/console/(migration-wizard)/step2.svelte
index 005b9e7bc..b875cc1d0 100644
--- a/src/routes/console/(migration-wizard)/step2.svelte
+++ b/src/routes/console/(migration-wizard)/step2.svelte
@@ -7,6 +7,16 @@
 </script>
 
 <WizardStep>
-    <svelte:fragment slot="title">Select data</svelte:fragment>
+    <svelte:fragment slot="title">Select resources</svelte:fragment>
+    <svelte:fragment slot="subtitle">
+        Select the resources you need to migrate to Appwrite. Some resources can be migrated, but
+        with limitations. <a
+            class="link"
+            href="https://appwrite.io/docs/migrations"
+            target="_blank"
+            rel="noopener noreferrer">
+            Learn about which resources are supported</a
+        >.
+    </svelte:fragment>
     <ResourceForm {provider} {formData} projectSdk={getSdkForProject($selectedProject)} />
 </WizardStep>
diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte
index cf229d45e..c7e0bda5a 100644
--- a/src/routes/console/+layout.svelte
+++ b/src/routes/console/+layout.svelte
@@ -23,8 +23,8 @@
     import { addNotification } from '$lib/stores/notifications';
     import { openMigrationWizard } from './(migration-wizard)';
     import { project } from './project-[project]/store';
-    import { sdk } from '$lib/stores/sdk';
     import { feedback } from '$lib/stores/feedback';
+    import { consoleVariables } from './store';
 
     function kebabToSentenceCase(str: string) {
         return str
@@ -35,8 +35,7 @@
 
     let isAssistantEnabled = false;
     onMount(async () => {
-        const vars = await sdk.forConsole.console.variables();
-        isAssistantEnabled = vars._APP_ASSISTANT_ENABLED === true;
+        isAssistantEnabled = (await $consoleVariables)?._APP_ASSISTANT_ENABLED === true;
     });
 
     $: isOnSettingsLayout = $project?.$id
diff --git a/src/routes/console/+layout.ts b/src/routes/console/+layout.ts
index b95930fa5..8221f5d43 100644
--- a/src/routes/console/+layout.ts
+++ b/src/routes/console/+layout.ts
@@ -1,8 +1,12 @@
+import { Dependencies } from '$lib/constants';
 import { sdk } from '$lib/stores/sdk';
 
 import type { LayoutLoad } from './$types';
 
-export const load: LayoutLoad = async ({ fetch }) => {
+export const load: LayoutLoad = async ({ fetch, depends }) => {
+    depends(Dependencies.RUNTIMES);
+    depends(Dependencies.CONSOLE_VARIABLES);
+
     const { endpoint, project } = sdk.forConsole.client.config;
     const response = await fetch(`${endpoint}/health/version`, {
         headers: {
@@ -12,6 +16,7 @@ export const load: LayoutLoad = async ({ fetch }) => {
     const data = await response.json();
 
     return {
+        consoleVariables: sdk.forConsole.console.variables(),
         version: data?.version ?? null
     };
 };
diff --git a/src/routes/console/project-[project]/auth/teams/+page.svelte b/src/routes/console/project-[project]/auth/teams/+page.svelte
index 5e6460b73..0d186ccc9 100644
--- a/src/routes/console/project-[project]/auth/teams/+page.svelte
+++ b/src/routes/console/project-[project]/auth/teams/+page.svelte
@@ -79,7 +79,7 @@
     {:else if data.search}
         <EmptySearch>
             <div class="u-text-center">
-                <b>Sorry, we couldn’t find ‘{data.search}’</b>
+                <b>Sorry, we couldn't find ‘{data.search}'</b>
                 <p>There are no teams that match your search.</p>
             </div>
             <Button secondary href={`/console/project-${$page.params.project}/auth/teams`}>
diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte
index 8fdc988e6..af796434d 100644
--- a/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte
+++ b/src/routes/console/project-[project]/auth/teams/team-[team]/members/+page.svelte
@@ -95,7 +95,7 @@
     {:else if data.search}
         <EmptySearch>
             <div class="u-text-center">
-                <b>Sorry, we couldn’t find ‘{data.search}’</b>
+                <b>Sorry, we couldn't find ‘{data.search}'</b>
                 <p>There are no members that match your search.</p>
             </div>
             <Button
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/(filters)/content.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/(filters)/content.svelte
index 799e9e7f4..58e98878f 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/(filters)/content.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/(filters)/content.svelte
@@ -73,7 +73,7 @@
     };
 
     $: operatorsForColumn = Object.entries(operators)
-        .filter(([_, v]) => v.types.includes(column?.type))
+        .filter(([, v]) => v.types.includes(column?.type))
         .map(([k]) => ({
             label: k,
             value: k
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/(filters)/store.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/(filters)/store.ts
index 164371553..48d971e07 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/(filters)/store.ts
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/(filters)/store.ts
@@ -76,7 +76,6 @@ export const queries = initQueries();
 export const queriesAreDirty = derived([queries, page], ([$queries, $page]) => {
     const paramQueries = $page.url.searchParams.get('query');
     const parsedQueries = queryParamToMap(paramQueries || '[]');
-    console.log({ $queries, parsedQueries, notDirty: deepEqual($queries, parsedQueries) });
 
     return !deepEqual($queries, parsedQueries);
 });
diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/+page.ts
index 6e43f6235..1da9b2ebc 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/+page.ts
+++ b/src/routes/console/project-[project]/functions/function-[function]/+page.ts
@@ -1,9 +1,8 @@
-import { Query, type Models } from '@appwrite.io/console';
+import { Query } from '@appwrite.io/console';
 import { sdk } from '$lib/stores/sdk';
 import { getLimit, getPage, pageToOffset } from '$lib/helpers/load';
 import { Dependencies, PAGE_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
-import { isSelfHosted } from '$lib/system';
 
 export const load: PageLoad = async ({ params, depends, url, route, parent }) => {
     await parent();
@@ -11,10 +10,6 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
     const page = getPage(url);
     const limit = getLimit(url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
-    let consoleVariables: Models.ConsoleVariables = null;
-    if (isSelfHosted) {
-        consoleVariables = await sdk.forConsole.console.variables();
-    }
 
     return {
         offset,
@@ -23,7 +18,6 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
             Query.limit(limit),
             Query.offset(offset),
             Query.orderDesc('')
-        ]),
-        consoleVariables
+        ])
     };
 };
diff --git a/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte b/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte
index 75437ae81..cada9f7e5 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/createManual.svelte
@@ -80,12 +80,13 @@
             required />
         {#if $func.version !== 'v3'}
             <Alert type="info">
-                <svelte:fragment slot="title"
-                    >Build commands now available for functions v3.0</svelte:fragment>
+                <svelte:fragment slot="title">
+                    Build commands now available for functions v3.0
+                </svelte:fragment>
                 Update your function version to make use of new features including build commands.
                 <svelte:fragment slot="buttons">
-                    <!-- TODO: add link to docs -->
-                    <Button href="#/" external text>Learn more</Button>
+                    <Button href="https://appwrite.io/docs/functions-develop#upgrade" external text
+                        >Learn more</Button>
                 </svelte:fragment>
             </Alert>
         {:else}
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index 48ff1087a..a6d1daf72 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -34,7 +34,7 @@
                     `functions.${$page.params.function}.deployments.${$page.params.deployment}.update`
                 )
             ) {
-                logs = (message.payload as any).logs as string;
+                logs = message.payload.buildLogs;
                 if (message.payload.status === 'ready') {
                     invalidate(Dependencies.DEPLOYMENT);
                 }
diff --git a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
index 1ddddbb7f..26824e5f7 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte
@@ -113,8 +113,9 @@
                 Update your function version to make use of new features including customizable HTTP
                 data in your executions.
                 <svelte:fragment slot="buttons">
-                    <!-- TODO: add link to docs -->
-                    <Button href="#/" external text>Learn more</Button>
+                    <Button href="https://appwrite.io/docs/functions-develop#upgrade" external text>
+                        Learn more
+                    </Button>
                 </svelte:fragment>
             </Alert>
             <InputTextarea
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte
index 108ae020a..dabf341fe 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte
@@ -47,11 +47,16 @@
             <svelte:fragment slot="title">Your function is outdated</svelte:fragment>
             Update your function version to make use of new features including build commands and HTTP
             data in your executions. To update, follow the steps outlined in our
-            <!-- TODO: Add link to docs -->
-            <a href="#/" target="_blank" rel="noopener noreferrer" class="link">documentation</a>.
+            <a
+                href="https://appwrite.io/docs/functions-develop#upgrade"
+                target="_blank"
+                rel="noopener noreferrer"
+                class="link">documentation</a
+            >.
             <svelte:fragment slot="buttons">
-                <!-- TODO: Add link to docs -->
-                <Button href="#/" external text>Learn more</Button>
+                <Button href="https://appwrite.io/docs/functions-develop#upgrade" external text>
+                    Learn more
+                </Button>
             </svelte:fragment>
         </Alert>
     {/if}
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
index edebc1d10..58dab72f2 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateConfiguration.svelte
@@ -49,7 +49,7 @@
     import InputSelectSearch from '$lib/elements/forms/inputSelectSearch.svelte';
     import { installations } from '$lib/wizards/functions/store';
     import { isSelfHosted } from '$lib/system';
-    import { consoleVariables } from '$lib/stores/consoleVariables';
+    import { consoleVariables, isVcsEnabled } from '$routes/console/store';
 
     const functionId = $page.params.function;
 
@@ -172,8 +172,6 @@
         selectedBranch !== $func?.providerBranch ||
         silentMode !== $func?.providerSilentMode ||
         selectedDir !== $func?.providerRootDirectory;
-
-    $: isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
 </script>
 
 <Form onSubmit={updateConfiguration}>
@@ -282,7 +280,7 @@
                                 </div>
                             </Box>
                         {:else}
-                            {#if isSelfHosted && !isVcsEnabled}
+                            {#if isSelfHosted && !isVcsEnabled($consoleVariables)}
                                 <Alert class="common-section" type="info">
                                     <svelte:fragment slot="title">
                                         Installing Git to a self-hosted instance
@@ -290,8 +288,12 @@
                                     When installing Git in a locally hosted Appwrite project, you must
                                     first configure your environment variables.
                                     <svelte:fragment slot="buttons">
-                                        <!-- TODO: add link to docs -->
-                                        <Button href="#/" external text>Learn more</Button>
+                                        <Button
+                                            href="https://appwrite.io/docs/environment-variables#vcs_(version_control_system)"
+                                            external
+                                            text>
+                                            Learn more
+                                        </Button>
                                     </svelte:fragment>
                                 </Alert>
                             {/if}
@@ -313,6 +315,7 @@
                                     </div>
                                     <Button
                                         secondary
+                                        disabled={isSelfHosted && !isVcsEnabled}
                                         on:click={() => wizard.start(ConnectExisting)}>
                                         <span class="text">Connect Git</span>
                                     </Button>
diff --git a/src/lib/stores/consoleVariables.ts b/src/routes/console/project-[project]/functions/store.ts
similarity index 56%
rename from src/lib/stores/consoleVariables.ts
rename to src/routes/console/project-[project]/functions/store.ts
index 887820b6b..029ac922d 100644
--- a/src/lib/stores/consoleVariables.ts
+++ b/src/routes/console/project-[project]/functions/store.ts
@@ -2,7 +2,7 @@ import { page } from '$app/stores';
 import { derived } from 'svelte/store';
 import type { Models } from '@appwrite.io/console';
 
-export const consoleVariables = derived(
+export const runtimes = derived(
     page,
-    ($page) => $page.data.consoleVariables as Models.ConsoleVariables
+    async ($page) => (await $page.data.runtimes) as Models.RuntimeList
 );
diff --git a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
index 6b089bce2..5362ac55c 100644
--- a/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
@@ -4,12 +4,10 @@
     import { Pill } from '$lib/elements';
     import { Button } from '$lib/elements/forms';
     import { Container } from '$lib/layout';
-    import { consoleVariables } from '$lib/stores/consoleVariables';
     import { isSelfHosted } from '$lib/system';
     import { connectTemplate } from '$lib/wizards/functions/cover.svelte';
+    import { consoleVariables, isVcsEnabled } from '$routes/console/store';
     import { template } from './store';
-
-    $: isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
 </script>
 
 <Container>
@@ -62,7 +60,7 @@
                     </span>
                 </Heading>
                 <p class="u-margin-block-start-24">{$template.tagline}</p>
-                {#if isSelfHosted && !isVcsEnabled}
+                {#if isSelfHosted && !isVcsEnabled($consoleVariables)}
                     <Alert class="u-margin-block-start-24" type="info">
                         <svelte:fragment slot="title">
                             Cloning templates to a self-hosted instance
@@ -70,8 +68,12 @@
                         In order to clone a template to a locally hosted Appwrite project, you must set
                         up a Git integration and configure your environment variables.
                         <svelte:fragment slot="buttons">
-                            <!-- TODO: add link to docs -->
-                            <Button href="#/" external text>Learn more</Button>
+                            <Button
+                                href="https://appwrite.io/docs/environment-variables"
+                                external
+                                text>
+                                Learn more
+                            </Button>
                         </svelte:fragment>
                     </Alert>
                 {/if}
@@ -83,7 +85,10 @@
                         View source
                         <span class="icon-external-link" />
                     </Button>
-                    <Button secondary on:click={() => connectTemplate($template)}>
+                    <Button
+                        disabled={isSelfHosted && !isVcsEnabled}
+                        secondary
+                        on:click={() => connectTemplate($template)}>
                         Create function
                     </Button>
                 </div>
diff --git a/src/routes/console/project-[project]/functions/wizard/step1.svelte b/src/routes/console/project-[project]/functions/wizard/step1.svelte
index 53c58e72e..08ca69fbe 100644
--- a/src/routes/console/project-[project]/functions/wizard/step1.svelte
+++ b/src/routes/console/project-[project]/functions/wizard/step1.svelte
@@ -5,7 +5,7 @@
     import { WizardStep } from '$lib/layout';
     import { onMount } from 'svelte';
     import { createFunction } from './store';
-    import { runtimes } from '$lib/wizards/functions/store';
+    import { runtimes } from '../store';
 
     let showCustomId = false;
 
@@ -20,8 +20,8 @@
 </script>
 
 <WizardStep>
-    <svelte:fragment slot="title">Create your function</svelte:fragment>
-    <svelte:fragment slot="subtitle">Let's create a function.</svelte:fragment>
+    <svelte:fragment slot="title">Configuration function</svelte:fragment>
+    <svelte:fragment slot="subtitle">Create your new Appwrite Function.</svelte:fragment>
     <FormList>
         <InputText
             label="Name"
diff --git a/src/routes/console/project-[project]/functions/wizard/step2.svelte b/src/routes/console/project-[project]/functions/wizard/step2.svelte
index 083feea3b..992ce0424 100644
--- a/src/routes/console/project-[project]/functions/wizard/step2.svelte
+++ b/src/routes/console/project-[project]/functions/wizard/step2.svelte
@@ -5,15 +5,15 @@
 </script>
 
 <WizardStep>
-    <svelte:fragment slot="title">Execute access</svelte:fragment>
+    <svelte:fragment slot="title">Permissions</svelte:fragment>
     <svelte:fragment slot="subtitle">
-        Choose who can execute this function using the client API. For more information, check out
-        the <a
+        Choose which users have permission to execute this function using Client SDKs. For more
+        information, check out the <a
             href="https://appwrite.io/docs/permissions"
             target="_blank"
             rel="noopener noreferrer"
             class="link">
-            Permissions guide
+            permissions documentation
         </a>.
     </svelte:fragment>
 
diff --git a/src/routes/console/project-[project]/functions/wizard/step3.svelte b/src/routes/console/project-[project]/functions/wizard/step3.svelte
index 95319ec88..58c099780 100644
--- a/src/routes/console/project-[project]/functions/wizard/step3.svelte
+++ b/src/routes/console/project-[project]/functions/wizard/step3.svelte
@@ -19,7 +19,13 @@
 <WizardStep>
     <svelte:fragment slot="title">Events</svelte:fragment>
     <svelte:fragment slot="subtitle">
-        Set the events that will trigger your function. Maximum 100 events allowed.
+        Set the events that will trigger your function. Maximum 100 events allowed.<a
+            href="https://appwrite.io/docs/events"
+            target="_blank"
+            rel="noopener noreferrer"
+            class="link">
+            Learn more about events.
+        </a>.
     </svelte:fragment>
 
     {#if $createFunction?.events?.length}
diff --git a/src/routes/console/project-[project]/functions/wizard/step5.svelte b/src/routes/console/project-[project]/functions/wizard/step5.svelte
index 932018ffe..4a0505bc7 100644
--- a/src/routes/console/project-[project]/functions/wizard/step5.svelte
+++ b/src/routes/console/project-[project]/functions/wizard/step5.svelte
@@ -45,7 +45,13 @@
 <WizardStep>
     <svelte:fragment slot="title">Variables</svelte:fragment>
     <svelte:fragment slot="subtitle">
-        Create the environment variables or secret keys that will be passed to your function
+        Create the environment variables or secret keys that will be passed to your function. <a
+            href="https://appwrite.io/docs/permissions"
+            target="_blank"
+            rel="noopener noreferrer"
+            class="link">
+            permissions documentation
+        </a>.
     </svelte:fragment>
     {#if $createFunction.vars.length}
         <Table noStyles>
diff --git a/src/routes/console/project-[project]/rawVariableEditor.svelte b/src/routes/console/project-[project]/rawVariableEditor.svelte
index 97382f807..012caaf69 100644
--- a/src/routes/console/project-[project]/rawVariableEditor.svelte
+++ b/src/routes/console/project-[project]/rawVariableEditor.svelte
@@ -12,9 +12,13 @@
     export let showEditor = false;
     export let variableList: Models.VariableList;
 
-    export let sdkCreateVariable: (key: string, value: string) => Promise<any>;
-    export let sdkUpdateVariable: (variableId: string, key: string, value: string) => Promise<any>;
-    export let sdkDeleteVariable: (variableId: string) => Promise<any>;
+    export let sdkCreateVariable: (key: string, value: string) => Promise<unknown>;
+    export let sdkUpdateVariable: (
+        variableId: string,
+        key: string,
+        value: string
+    ) => Promise<unknown>;
+    export let sdkDeleteVariable: (variableId: string) => Promise<unknown>;
 
     let error = '';
     let envCode = variableList.variables
diff --git a/src/routes/console/project-[project]/settings/+page.ts b/src/routes/console/project-[project]/settings/+page.ts
index e57a62558..125a929bd 100644
--- a/src/routes/console/project-[project]/settings/+page.ts
+++ b/src/routes/console/project-[project]/settings/+page.ts
@@ -1,18 +1,13 @@
 import { Dependencies, PAGE_LIMIT } from '$lib/constants';
 import { sdk } from '$lib/stores/sdk';
-import { Query, type Models } from '@appwrite.io/console';
+import { Query } from '@appwrite.io/console';
 import type { PageLoad } from './$types';
-import { isSelfHosted } from '$lib/system';
 
 export const load: PageLoad = async ({ depends, url }) => {
     depends(Dependencies.PROJECT_VARIABLES);
     depends(Dependencies.PROJECT_INSTALLATIONS);
     const limit = PAGE_LIMIT;
     const offset = Number(url.searchParams.get('offset') ?? 0);
-    let consoleVariables: Models.ConsoleVariables = null;
-    if (isSelfHosted) {
-        consoleVariables = await sdk.forConsole.console.variables();
-    }
 
     return {
         limit,
@@ -21,7 +16,6 @@ export const load: PageLoad = async ({ depends, url }) => {
         installations: await sdk.forProject.vcs.listInstallations([
             Query.limit(limit),
             Query.offset(offset)
-        ]),
-        consoleVariables
+        ])
     };
 };
diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte b/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte
index 09a306725..b881ba155 100644
--- a/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte
@@ -52,7 +52,16 @@
 </script>
 
 <WizardStep>
-    <svelte:fragment slot="title">Choose provider</svelte:fragment>
+    <svelte:fragment slot="title">Select source</svelte:fragment>
+    <svelte:fragment slot="subtitle">
+        Select a source platform with the project you want to migrate. <a
+            class="link"
+            href="https://appwrite.io/docs/migrations"
+            target="_blank"
+            rel="noopener noreferrer">
+            Learn about which platforms are supported</a
+        >.
+    </svelte:fragment>
     <div class="u-flex u-flex-vertical u-gap-8">
         {#each Object.entries(providers) as [key, value]}
             <label class="u-flex u-cross-center u-cursor-pointer u-gap-8">
diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/step2.svelte b/src/routes/console/project-[project]/settings/migrations/(import)/step2.svelte
index b1f7ccf35..0816d1551 100644
--- a/src/routes/console/project-[project]/settings/migrations/(import)/step2.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/(import)/step2.svelte
@@ -7,6 +7,16 @@
 </script>
 
 <WizardStep>
-    <svelte:fragment slot="title">Select data</svelte:fragment>
+    <svelte:fragment slot="title">Select source</svelte:fragment>
+    <svelte:fragment slot="subtitle">
+        Select the resources you need to migrate to Appwrite. Some resources can be migrated, but
+        with limitations. <a
+            class="link"
+            href="https://appwrite.io/docs/migrations"
+            target="_blank"
+            rel="noopener noreferrer">
+            Learn about which resources are supported</a
+        >.
+    </svelte:fragment>
     <ResourceForm {formData} {provider} projectSdk={sdk.forProject} />
 </WizardStep>
diff --git a/src/routes/console/project-[project]/settings/migrations/+page.svelte b/src/routes/console/project-[project]/settings/migrations/+page.svelte
index 1fe8cc105..857c0bcdc 100644
--- a/src/routes/console/project-[project]/settings/migrations/+page.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/+page.svelte
@@ -140,7 +140,15 @@
 
     <CardGrid>
         <Heading tag="h3" size="7">Import project data</Heading>
-        <p class="text">Import data from other products or from a different Appwrite instance</p>
+        <p class="text">
+            Import data from another platform or from a different Appwrite instance. <a
+                class="link"
+                href="https://appwrite.io/docs/migrations"
+                target="_blank"
+                rel="noopener noreferrer">
+                Learn about which platforms are supported</a
+            >.
+        </p>
         <svelte:fragment slot="aside">
             {#if data.migrations.length}
                 <div class="u-flex">
@@ -224,7 +232,14 @@
     {#if isSelfHosted}
         <CardGrid>
             <Heading tag="h3" size="7">Deploy to Cloud</Heading>
-            <p class="text">Export data from your project to Appwrite Cloud</p>
+            <p class="text">
+                Export data from your project to Appwrite Cloud. <a
+                    class="link"
+                    href="https://appwrite.io/docs/migrations-local-to-cloud"
+                    target="_blank"
+                    rel="noopener noreferrer">
+                    Learn more in our documentation.</a>
+            </p>
             <svelte:fragment slot="aside">
                 <div class="import-box">
                     <div class="u-flex u-cross-center u-gap-8">
@@ -244,7 +259,14 @@
     {:else}
         <CardGrid>
             <Heading tag="h3" size="7">Export to self-hosted instance</Heading>
-            <p class="text">Export data from your project to a self-hosted instance</p>
+            <p class="text">
+                Export data from your project to a self-hosted instance. <a
+                    class="link"
+                    href="https://appwrite.io/docs/migrations-cloud-to-local"
+                    target="_blank"
+                    rel="noopener noreferrer">
+                    Learn more in our documentation.</a>
+            </p>
             <svelte:fragment slot="aside">
                 <div class="import-box">
                     <div class="u-flex u-cross-center u-gap-8">
diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte
index 6a36b1452..919377a40 100644
--- a/src/routes/console/project-[project]/settings/updateInstallations.svelte
+++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte
@@ -29,7 +29,7 @@
     import GitDisconnectModal from './GitDisconnectModal.svelte';
     import dayjs from 'dayjs';
     import { isSelfHosted } from '$lib/system';
-    import { consoleVariables } from '$lib/stores/consoleVariables';
+    import { consoleVariables, isVcsEnabled } from '$routes/console/store';
 
     export let total: number;
     export let limit: number;
@@ -76,8 +76,6 @@
             noScroll: true
         });
     }
-
-    $: isVcsEnabled = $consoleVariables?._APP_VCS_ENABLED === true;
 </script>
 
 <CardGrid>
@@ -181,7 +179,7 @@
                     bind:offset />
             </div>
         {:else}
-            {#if isSelfHosted && !isVcsEnabled}
+            {#if isSelfHosted && !isVcsEnabled($consoleVariables)}
                 <Alert type="info">
                     <svelte:fragment slot="title">
                         Installing Git to a self-hosted instance
@@ -189,8 +187,12 @@
                     When installing Git in a locally hosted Appwrite project, you must first configure
                     your environment variables.
                     <svelte:fragment slot="buttons">
-                        <!-- TODO: add link to docs -->
-                        <Button href="#/" external text>Learn more</Button>
+                        <Button
+                            href="https://appwrite.io/docs/environment-variables#vcs_(version_control_system)"
+                            external
+                            text>
+                            Learn more
+                        </Button>
                     </svelte:fragment>
                 </Alert>
             {/if}
@@ -202,7 +204,10 @@
 
                         <div class="avatar"><SvgIcon name="appwrite" type="color" size={80} /></div>
                     </div>
-                    <Button on:click={() => (showGitIstall = true)} secondary>
+                    <Button
+                        disabled={isSelfHosted && !isVcsEnabled($consoleVariables)}
+                        on:click={() => (showGitIstall = true)}
+                        secondary>
                         <span class="text">Add Installation</span>
                     </Button>
                 </div>
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte
index 578098cfb..eff8f7170 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte
@@ -200,7 +200,7 @@
     {:else if data.search}
         <EmptySearch>
             <div class="u-text-center">
-                <b>Sorry, we couldn’t find ‘{data.search}’</b>
+                <b>Sorry, we couldn't find ‘{data.search}'</b>
                 <p>There are no files that match your search.</p>
             </div>
             <div class="u-flex u-gap-16">
diff --git a/src/routes/console/project-[project]/store.ts b/src/routes/console/project-[project]/store.ts
index a7051573b..4413c76dd 100644
--- a/src/routes/console/project-[project]/store.ts
+++ b/src/routes/console/project-[project]/store.ts
@@ -4,7 +4,6 @@ import type { BarSeriesOption } from 'echarts/charts';
 import { derived, writable } from 'svelte/store';
 
 export const project = derived(page, ($page) => $page.data.project as Models.Project);
-
 export const onboarding = derived(
     project,
     ($project) => $project?.platforms?.length === 0 && $project?.keys?.length === 0
diff --git a/src/routes/console/project-[project]/updateVariables.svelte b/src/routes/console/project-[project]/updateVariables.svelte
index a9057b0f0..f9232bf84 100644
--- a/src/routes/console/project-[project]/updateVariables.svelte
+++ b/src/routes/console/project-[project]/updateVariables.svelte
@@ -37,9 +37,13 @@
     export let globalVariableList: Models.VariableList | undefined = undefined;
 
     export let isGlobal: boolean;
-    export let sdkCreateVariable: (key: string, value: string) => Promise<any>;
-    export let sdkUpdateVariable: (variableId: string, key: string, value: string) => Promise<any>;
-    export let sdkDeleteVariable: (variableId: string) => Promise<any>;
+    export let sdkCreateVariable: (key: string, value: string) => Promise<unknown>;
+    export let sdkUpdateVariable: (
+        variableId: string,
+        key: string,
+        value: string
+    ) => Promise<unknown>;
+    export let sdkDeleteVariable: (variableId: string) => Promise<unknown>;
 
     let showVariablesDropdown = [];
     let selectedVar: Models.Variable = null;
diff --git a/src/routes/console/project-[project]/uploadVariablesModal.svelte b/src/routes/console/project-[project]/uploadVariablesModal.svelte
index 1d8e7b406..0a8484b7c 100644
--- a/src/routes/console/project-[project]/uploadVariablesModal.svelte
+++ b/src/routes/console/project-[project]/uploadVariablesModal.svelte
@@ -9,8 +9,12 @@
     export let isGlobal: boolean;
     export let show = false;
     export let variableList: Models.VariableList;
-    export let sdkCreateVariable: (key: string, value: string) => Promise<any>;
-    export let sdkUpdateVariable: (variableId: string, key: string, value: string) => Promise<any>;
+    export let sdkCreateVariable: (key: string, value: string) => Promise<unknown>;
+    export let sdkUpdateVariable: (
+        variableId: string,
+        key: string,
+        value: string
+    ) => Promise<unknown>;
 
     let files: FileList;
     let error: string;
diff --git a/src/routes/console/store.ts b/src/routes/console/store.ts
index 2e8023dda..d8f11992f 100644
--- a/src/routes/console/store.ts
+++ b/src/routes/console/store.ts
@@ -1,4 +1,12 @@
 import { page } from '$app/stores';
+import type { Models } from '@appwrite.io/console';
 import { derived } from 'svelte/store';
 
 export const version = derived(page, ($page) => $page.data.version as string | null);
+export const consoleVariables = derived(
+    page,
+    async ($page) => (await $page.data.consoleVariables) as Models.ConsoleVariables
+);
+export async function isVcsEnabled(store: Promise<Models.ConsoleVariables>) {
+    return (await store)?._APP_VCS_ENABLED === true;
+}
diff --git a/src/routes/store.ts b/src/routes/store.ts
index c2f973b21..be6859877 100644
--- a/src/routes/store.ts
+++ b/src/routes/store.ts
@@ -7,4 +7,4 @@ export const loading = writable(true);
 export const organizations = derived(page, ($page) => {
     return $page.data.organizations as Models.TeamList<Models.Preferences>;
 });
-export const requestedMigration = writable<Record<string, any> | null>(null);
+export const requestedMigration = writable<Record<string, string> | null>(null);