diff --git a/src/lib/pages/domains/wizard/step1.svelte b/src/lib/pages/domains/wizard/step1.svelte
index a5b971fad..5b21ca35b 100644
--- a/src/lib/pages/domains/wizard/step1.svelte
+++ b/src/lib/pages/domains/wizard/step1.svelte
@@ -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/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]/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 94e838123..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
@@ -288,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}
@@ -311,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/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/console/project-[project]/functions/templates/template-[template]/+page.svelte
index 850de5371..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
@@ -68,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}
@@ -81,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]/overview/platforms/wizard/web/step2.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte
index 3e1921ef0..75007597f 100644
--- a/src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte
@@ -14,10 +14,12 @@
 
     const example1 = `import { Client } from 'appwrite';`;
     const example2 =
-        `<script src="https://cdn.jsdelivr.net/npm/appwrite@${$versions['client-web']}" />
-<script>
+        `<script src="https://cdn.jsdelivr.net/npm/appwrite@${$versions['client-web']}"></script` +
+        `>\n` +
+        `<script>
     const { Client } = Appwrite;
-</script` + `>`; // Prevent svelte from processing the closing script tag
+</script` +
+        `>`; // Prevent svelte from processing the closing script tag
 </script>
 
 <WizardStep>
diff --git a/src/routes/console/project-[project]/settings/updateInstallations.svelte b/src/routes/console/project-[project]/settings/updateInstallations.svelte
index 5ccb5b1f3..158634713 100644
--- a/src/routes/console/project-[project]/settings/updateInstallations.svelte
+++ b/src/routes/console/project-[project]/settings/updateInstallations.svelte
@@ -187,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}
@@ -200,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}
+                        on:click={() => (showGitIstall = true)}
+                        secondary>
                         <span class="text">Add Installation</span>
                     </Button>
                 </div>