diff --git a/src/lib/utils/metadata.ts b/src/lib/utils/metadata.ts
index 3a2aadb28e2..ecb441f8b04 100644
--- a/src/lib/utils/metadata.ts
+++ b/src/lib/utils/metadata.ts
@@ -13,15 +13,21 @@ export function buildOpenGraphImage(title: string, description: string): string
     )}&subtitle=${encodeURIComponent(description)}`;
 }
 
+/**
+ * Escapes `<` as the JSON unicode escape `\u003c` so the result can be embedded
+ * inside HTML `<script>` tags (including SvelteKit route data) without `</script>`
+ * or similar sequences in string values ending the script early. `JSON.parse`
+ * still yields the original `<`.
+ */
+export function escapeJsonLtForHtmlScript(json: string): string {
+    return json.replace(/</g, '\\u003c');
+}
+
 /**
  * Returns an inlined JSON-LD script tag without breaking IDE formatting.
- *
- * Escapes `<` as `\u003c` so content like `</script>` inside string values
- * (e.g. code samples in forum posts) cannot prematurely close the script element
- * in HTML; JSON.parse still yields the original `<`.
  */
 export function getInlinedScriptTag(jsonSchema: string): string {
-    const safeForInlineScript = jsonSchema.replace(/</g, '\\u003c');
+    const safeForInlineScript = escapeJsonLtForHtmlScript(jsonSchema);
     return `<script type="application/ld+json">${safeForInlineScript}</` + 'script>';
 }
 
@@ -43,7 +49,7 @@ export function organizationJsonSchema() {
         legalName: 'Appwrite Code Ltd.',
         description:
             'A secure open-source backend server provides the core APIs required to build web and mobile applications. Appwrite provides authentication, database, storage, functions, messaging, and advanced realtime capabilities.',
-        logo: 'https://appwrite.io/assets/logotype/white.avif'
+        logo: 'https://appwrite.io/assets/logotype/white.png'
     });
 }
 
@@ -246,5 +252,5 @@ export function createDiscussionForumPageSchema(options: {
         mainEntity
     };
 
-    return JSON.stringify(graph);
+    return escapeJsonLtForHtmlScript(JSON.stringify(graph));
 }
diff --git a/src/routes/(marketing)/+page.svelte b/src/routes/(marketing)/+page.svelte
index 6112d4d625d..39e5d4162b2 100644
--- a/src/routes/(marketing)/+page.svelte
+++ b/src/routes/(marketing)/+page.svelte
@@ -1,5 +1,14 @@
 <script lang="ts">
-    import { browser } from '$app/environment';
+    import { browser, building } from '$app/environment';
+    import { page } from '$app/state';
+    import {
+        DEFAULT_HERO_CTA,
+        DEFAULT_HERO_SUBTITLE,
+        DEFAULT_HERO_TITLE
+    } from '$lib/statsig/constants';
+    import { resolveHeroQueryOverrides } from '$lib/statsig/hero-query-overrides';
+    import type { HeroLayoutVariant } from '$lib/statsig/hero-layout';
+    import type { PageData } from './$types';
     import Bento from './(components)/bento/bento.svelte';
     import CaseStudies from './(components)/case-studies.svelte';
     import Features from './(components)/features.svelte';
@@ -14,10 +23,30 @@
     import { FooterNav, MainFooter } from '$lib/components';
     import LogoList from './(components)/logo-list.svelte';
     import Ai from './(components)/ai.svelte';
+
+    /** Same baseline + query resolution as `hero.svelte`; tab title prefixes the brand. */
+    type MarketingHeroPageData = PageData & {
+        statsigBootstrap?: string | null;
+        statsigStableUserId?: string | null;
+        statsigUserAgent?: string | null;
+    };
+
+    const data = $derived(page.data as MarketingHeroPageData);
+
+    const heroPageTitle = $derived(
+        resolveHeroQueryOverrides(building ? new URLSearchParams() : page.url.searchParams, {
+            heroLayout: (data.heroLayout ?? 0) as HeroLayoutVariant,
+            heroSubtitle: data.heroSubtitle ?? DEFAULT_HERO_SUBTITLE,
+            heroTitle: data.heroTitle ?? DEFAULT_HERO_TITLE,
+            heroCta: data.heroCta ?? DEFAULT_HERO_CTA
+        }).heroTitle
+    );
+
+    const homepageDocumentTitle = $derived(`Appwrite - ${heroPageTitle}`);
 </script>
 
 <Head
-    title="Appwrite - Build like a team of hundreds"
+    title={homepageDocumentTitle}
     description="Build like a team of hundreds with Appwrite's all-in-one, open-source infrastructure. Launch in minutes, use any framework, and scale affordably with Auth, Database, Storage, Functions, Realtime, Messaging, and Sites for static sites, SSR, and CSR frontends."
 />
 
diff --git a/src/routes/threads/[id]/+page.svelte b/src/routes/threads/[id]/+page.svelte
index 80a59c5e89d..af2affe3f8b 100644
--- a/src/routes/threads/[id]/+page.svelte
+++ b/src/routes/threads/[id]/+page.svelte
@@ -138,7 +138,7 @@
         display: grid;
         grid-template-columns: 1fr auto;
         gap: 4rem;
-        align-items: center;
+        align-items: start;
 
         margin-block-start: 2.5rem;
     }
