diff --git a/demos/ai-chat/app/globals.css b/demos/ai-chat/app/globals.css
index df29e2c..cb3aa81 100644
--- a/demos/ai-chat/app/globals.css
+++ b/demos/ai-chat/app/globals.css
@@ -2,15 +2,9 @@
 @import "tw-animate-css";
 @import "@btst/stack/plugins/ai-chat/css";
 @import "@btst/stack/plugins/route-docs/css";
-/* WebContainers workaround: the WASM Tailwind scanner cannot traverse node_modules
- * (https://github.com/tailwindlabs/tailwindcss/issues/18418). copy-stack-src.mjs
- * (run via predev/prebuild) copies @btst/stack/src outside node_modules so Tailwind
- * can scan it. Safe to remove once the upstream bug is fixed. */
+/* WebContainers workaround: the WASM Tailwind scanner cannot traverse node_modules (https://github.com/tailwindlabs/tailwindcss/issues/18418). copy-stack-src.mjs (run via dev/build) copies @btst/stack/src outside node_modules so Tailwind can scan it. Safe to remove once the upstream bug is fixed. */
 @source "./.btst-stack-src/**/*.{ts,tsx}";
 @source "./.btst-stack-ui/**/*.{ts,tsx}";
-/* Monorepo fallback: direct source path used in local development */
-@source "../../../packages/stack/src/**/*.{ts,tsx}";
-@source "../../../packages/ui/src/**/*.{ts,tsx}";
 
 @custom-variant dark (&:is(.dark *));
 
diff --git a/demos/ai-chat/app/pages/layout.tsx b/demos/ai-chat/app/pages/layout.tsx
index 3856470..6c94754 100644
--- a/demos/ai-chat/app/pages/layout.tsx
+++ b/demos/ai-chat/app/pages/layout.tsx
@@ -9,7 +9,7 @@ import type { AiChatPluginOverrides } from "@btst/stack/plugins/ai-chat/client";
 import { getOrCreateQueryClient } from "@/lib/query-client";
 
 type PluginOverrides = {
-	aiChat: AiChatPluginOverrides;
+	"ai-chat": AiChatPluginOverrides;
 };
 
 const hasApiKey =
@@ -33,7 +33,7 @@ export default function PagesLayout({
 				<StackProvider<PluginOverrides>
 					basePath="/pages"
 					overrides={{
-						aiChat: {
+						"ai-chat": {
 							apiBaseURL: baseURL,
 							apiBasePath: "/api/data",
 							mode: "public",
diff --git a/demos/ai-chat/copy-stack-src.mjs b/demos/ai-chat/copy-stack-src.mjs
index dc457f0..eca1c4d 100644
--- a/demos/ai-chat/copy-stack-src.mjs
+++ b/demos/ai-chat/copy-stack-src.mjs
@@ -12,10 +12,10 @@ import { cp, mkdir, rm } from "fs/promises";
 import { existsSync } from "fs";
 
 const src = "node_modules/@btst/stack/src";
-const dest = ".btst-stack-src";
+const dest = "app/.btst-stack-src";
 
 const uiSrc = "node_modules/@btst/stack/dist/packages/ui";
-const uiDest = ".btst-stack-ui";
+const uiDest = "app/.btst-stack-ui";
 
 if (!existsSync(src)) {
 	// Likely running in the monorepo where the workspace symlink does not expose
diff --git a/demos/blog/app/globals.css b/demos/blog/app/globals.css
index 2829890..e183a2c 100644
--- a/demos/blog/app/globals.css
+++ b/demos/blog/app/globals.css
@@ -2,15 +2,9 @@
 @import "tw-animate-css";
 @import "@btst/stack/plugins/blog/css";
 @import "@btst/stack/plugins/route-docs/css";
-/* WebContainers workaround: the WASM Tailwind scanner cannot traverse node_modules
- * (https://github.com/tailwindlabs/tailwindcss/issues/18418). copy-stack-src.mjs
- * (run via predev/prebuild) copies @btst/stack/src outside node_modules so Tailwind
- * can scan it. Safe to remove once the upstream bug is fixed. */
+/* WebContainers workaround: the WASM Tailwind scanner cannot traverse node_modules (https://github.com/tailwindlabs/tailwindcss/issues/18418). copy-stack-src.mjs (run via dev/build) copies @btst/stack/src outside node_modules so Tailwind can scan it. Safe to remove once the upstream bug is fixed. */
 @source "./.btst-stack-src/**/*.{ts,tsx}";
 @source "./.btst-stack-ui/**/*.{ts,tsx}";
-/* Monorepo fallback: direct source path used in local development */
-@source "../../../packages/stack/src/**/*.{ts,tsx}";
-@source "../../../packages/ui/src/**/*.{ts,tsx}";
 
 @custom-variant dark (&:is(.dark *));
 
diff --git a/demos/blog/copy-stack-src.mjs b/demos/blog/copy-stack-src.mjs
index dc457f0..eca1c4d 100644
--- a/demos/blog/copy-stack-src.mjs
+++ b/demos/blog/copy-stack-src.mjs
@@ -12,10 +12,10 @@ import { cp, mkdir, rm } from "fs/promises";
 import { existsSync } from "fs";
 
 const src = "node_modules/@btst/stack/src";
-const dest = ".btst-stack-src";
+const dest = "app/.btst-stack-src";
 
 const uiSrc = "node_modules/@btst/stack/dist/packages/ui";
-const uiDest = ".btst-stack-ui";
+const uiDest = "app/.btst-stack-ui";
 
 if (!existsSync(src)) {
 	// Likely running in the monorepo where the workspace symlink does not expose
diff --git a/demos/cms/app/globals.css b/demos/cms/app/globals.css
index 5b5e523..e14b130 100644
--- a/demos/cms/app/globals.css
+++ b/demos/cms/app/globals.css
@@ -2,15 +2,9 @@
 @import "tw-animate-css";
 @import "@btst/stack/plugins/cms/css";
 @import "@btst/stack/plugins/route-docs/css";
-/* WebContainers workaround: the WASM Tailwind scanner cannot traverse node_modules
- * (https://github.com/tailwindlabs/tailwindcss/issues/18418). copy-stack-src.mjs
- * (run via predev/prebuild) copies @btst/stack/src outside node_modules so Tailwind
- * can scan it. Safe to remove once the upstream bug is fixed. */
+/* WebContainers workaround: the WASM Tailwind scanner cannot traverse node_modules (https://github.com/tailwindlabs/tailwindcss/issues/18418). copy-stack-src.mjs (run via dev/build) copies @btst/stack/src outside node_modules so Tailwind can scan it. Safe to remove once the upstream bug is fixed. */
 @source "./.btst-stack-src/**/*.{ts,tsx}";
 @source "./.btst-stack-ui/**/*.{ts,tsx}";
-/* Monorepo fallback: direct source path used in local development */
-@source "../../../packages/stack/src/**/*.{ts,tsx}";
-@source "../../../packages/ui/src/**/*.{ts,tsx}";
 
 @custom-variant dark (&:is(.dark *));
 
diff --git a/demos/cms/app/pages/articles/[slug]/page.tsx b/demos/cms/app/pages/articles/[slug]/page.tsx
new file mode 100644
index 0000000..92ae0e9
--- /dev/null
+++ b/demos/cms/app/pages/articles/[slug]/page.tsx
@@ -0,0 +1,82 @@
+import { myStack } from "@/lib/stack";
+import Link from "next/link";
+import { notFound } from "next/navigation";
+import type { Metadata } from "next";
+
+export const dynamic = "force-dynamic";
+
+type ArticleData = {
+	title: string;
+	summary: string;
+	body: string;
+	publishedAt?: string;
+	published: boolean;
+};
+
+export async function generateMetadata({
+	params,
+}: {
+	params: Promise<{ slug: string }>;
+}): Promise<Metadata> {
+	const { slug } = await params;
+	const item = await myStack.api.cms.getContentItemBySlug("article", slug);
+	if (!item) return { title: "Not Found" };
+	const data = item.parsedData as ArticleData;
+	return {
+		title: data.title,
+		description: data.summary,
+	};
+}
+
+export default async function ArticlePage({
+	params,
+}: {
+	params: Promise<{ slug: string }>;
+}) {
+	const { slug } = await params;
+	const item = await myStack.api.cms.getContentItemBySlug("article", slug);
+
+	if (!item) notFound();
+
+	const data = item.parsedData as ArticleData;
+
+	return (
+		<div className="max-w-3xl mx-auto px-4 py-12">
+			<Link
+				href="/pages/articles"
+				className="inline-flex items-center gap-1 text-sm text-muted-foreground hover:text-foreground transition-colors mb-10"
+			>
+				← All articles
+			</Link>
+
+			<article>
+				<header className="mb-8">
+					<h1 className="text-3xl font-bold mb-3">{data.title}</h1>
+					{data.publishedAt && (
+						<time className="text-sm text-muted-foreground">
+							{new Date(data.publishedAt).toLocaleDateString("en-US", {
+								year: "numeric",
+								month: "long",
+								day: "numeric",
+							})}
+						</time>
+					)}
+				</header>
+
+				<p className="text-lg text-muted-foreground leading-relaxed border-l-2 pl-4 mb-8">
+					{data.summary}
+				</p>
+
+				<div className="prose prose-sm max-w-none text-foreground space-y-4">
+					{data.body.split("\n\n").map((paragraph, i) =>
+						paragraph.trim() ? (
+							<p key={i} className="leading-relaxed">
+								{paragraph.trim()}
+							</p>
+						) : null,
+					)}
+				</div>
+			</article>
+		</div>
+	);
+}
diff --git a/demos/cms/app/pages/articles/page.tsx b/demos/cms/app/pages/articles/page.tsx
new file mode 100644
index 0000000..2c8ec79
--- /dev/null
+++ b/demos/cms/app/pages/articles/page.tsx
@@ -0,0 +1,67 @@
+import { myStack } from "@/lib/stack";
+import Link from "next/link";
+
+export const dynamic = "force-dynamic";
+
+type ArticleData = {
+	title: string;
+	summary: string;
+	body: string;
+	publishedAt?: string;
+	published: boolean;
+};
+
+export default async function ArticlesPage() {
+	const { items } = await myStack.api.cms.getAllContentItems("article");
+	const published = items.filter(
+		(item) => (item.parsedData as ArticleData).published,
+	);
+
+	return (
+		<div className="max-w-3xl mx-auto px-4 py-12">
+			<div className="mb-10">
+				<h1 className="text-3xl font-bold mb-2">Articles</h1>
+				<p className="text-muted-foreground">
+					Content managed with the BTST CMS plugin.
+				</p>
+			</div>
+
+			{published.length === 0 ? (
+				<p className="text-muted-foreground">No published articles yet.</p>
+			) : (
+				<div className="divide-y">
+					{published.map((item) => {
+						const data = item.parsedData as ArticleData;
+						return (
+							<Link
+								key={item.id}
+								href={`/pages/articles/${item.slug}`}
+								className="block group py-8 first:pt-0"
+							>
+								<div className="flex items-start justify-between gap-6">
+									<div className="min-w-0">
+										<h2 className="text-xl font-semibold group-hover:underline underline-offset-2 mb-2">
+											{data.title}
+										</h2>
+										<p className="text-muted-foreground text-sm leading-relaxed">
+											{data.summary}
+										</p>
+									</div>
+									{data.publishedAt && (
+										<time className="text-xs text-muted-foreground whitespace-nowrap mt-1 shrink-0">
+											{new Date(data.publishedAt).toLocaleDateString("en-US", {
+												year: "numeric",
+												month: "short",
+												day: "numeric",
+											})}
+										</time>
+									)}
+								</div>
+							</Link>
+						);
+					})}
+				</div>
+			)}
+		</div>
+	);
+}
diff --git a/demos/cms/app/pages/layout.tsx b/demos/cms/app/pages/layout.tsx
index 28ccac9..a4d9c73 100644
--- a/demos/cms/app/pages/layout.tsx
+++ b/demos/cms/app/pages/layout.tsx
@@ -47,6 +47,12 @@ export default function PagesLayout({
 								BTST CMS Demo
 							</Link>
 							<div className="flex items-center gap-4 text-sm">
+								<Link
+									href="/pages/articles"
+									className="text-muted-foreground hover:text-foreground transition-colors"
+								>
+									Articles
+								</Link>
 								<Link
 									href="/pages/cms"
 									className="text-muted-foreground hover:text-foreground transition-colors"
diff --git a/demos/cms/copy-stack-src.mjs b/demos/cms/copy-stack-src.mjs
index dc457f0..eca1c4d 100644
--- a/demos/cms/copy-stack-src.mjs
+++ b/demos/cms/copy-stack-src.mjs
@@ -12,10 +12,10 @@ import { cp, mkdir, rm } from "fs/promises";
 import { existsSync } from "fs";
 
 const src = "node_modules/@btst/stack/src";
-const dest = ".btst-stack-src";
+const dest = "app/.btst-stack-src";
 
 const uiSrc = "node_modules/@btst/stack/dist/packages/ui";
-const uiDest = ".btst-stack-ui";
+const uiDest = "app/.btst-stack-ui";
 
 if (!existsSync(src)) {
 	// Likely running in the monorepo where the workspace symlink does not expose
diff --git a/demos/form-builder/app/globals.css b/demos/form-builder/app/globals.css
index dc6bac3..1d963b6 100644
--- a/demos/form-builder/app/globals.css
+++ b/demos/form-builder/app/globals.css
@@ -2,15 +2,9 @@
 @import "tw-animate-css";
 @import "@btst/stack/plugins/form-builder/css";
 @import "@btst/stack/plugins/route-docs/css";
-/* WebContainers workaround: the WASM Tailwind scanner cannot traverse node_modules
- * (https://github.com/tailwindlabs/tailwindcss/issues/18418). copy-stack-src.mjs
- * (run via predev/prebuild) copies @btst/stack/src outside node_modules so Tailwind
- * can scan it. Safe to remove once the upstream bug is fixed. */
+/* WebContainers workaround: the WASM Tailwind scanner cannot traverse node_modules (https://github.com/tailwindlabs/tailwindcss/issues/18418). copy-stack-src.mjs (run via dev/build) copies @btst/stack/src outside node_modules so Tailwind can scan it. Safe to remove once the upstream bug is fixed. */
 @source "./.btst-stack-src/**/*.{ts,tsx}";
 @source "./.btst-stack-ui/**/*.{ts,tsx}";
-/* Monorepo fallback: direct source path used in local development */
-@source "../../../packages/stack/src/**/*.{ts,tsx}";
-@source "../../../packages/ui/src/**/*.{ts,tsx}";
 
 @custom-variant dark (&:is(.dark *));
 
diff --git a/demos/form-builder/app/pages/layout.tsx b/demos/form-builder/app/pages/layout.tsx
index 44d84d9..7d482b5 100644
--- a/demos/form-builder/app/pages/layout.tsx
+++ b/demos/form-builder/app/pages/layout.tsx
@@ -7,7 +7,7 @@ import { StackProvider } from "@btst/stack/context";
 import type { FormBuilderPluginOverrides } from "@btst/stack/plugins/form-builder/client";
 import { getOrCreateQueryClient } from "@/lib/query-client";
 
-type PluginOverrides = { formBuilder: FormBuilderPluginOverrides };
+type PluginOverrides = { "form-builder": FormBuilderPluginOverrides };
 
 export default function PagesLayout({
 	children,
@@ -26,7 +26,7 @@ export default function PagesLayout({
 			<StackProvider<PluginOverrides>
 				basePath="/pages"
 				overrides={{
-					formBuilder: {
+					"form-builder": {
 						apiBaseURL: baseURL,
 						apiBasePath: "/api/data",
 						navigate: (path) => router.push(path),
@@ -41,18 +41,24 @@ export default function PagesLayout({
 					<nav className="border-b bg-background sticky top-0 z-50">
 						<div className="max-w-5xl mx-auto px-4 h-14 flex items-center justify-between">
 							<Link
-								href="/pages/form-builder"
+								href="/pages/forms"
 								className="font-semibold text-lg hover:opacity-75 transition-opacity"
 							>
 								BTST Form Builder Demo
 							</Link>
 							<div className="flex items-center gap-4 text-sm">
 								<Link
-									href="/pages/form-builder"
+									href="/pages/forms"
 									className="text-muted-foreground hover:text-foreground transition-colors"
 								>
 									Forms
 								</Link>
+								<Link
+									href="/submit/contact-us"
+									className="text-muted-foreground hover:text-foreground transition-colors"
+								>
+									Live Demo
+								</Link>
 								<a
 									href="/api/data/reference"
 									className="text-muted-foreground hover:text-foreground transition-colors"
diff --git a/demos/form-builder/app/submit/[slug]/page.tsx b/demos/form-builder/app/submit/[slug]/page.tsx
new file mode 100644
index 0000000..ce13806
--- /dev/null
+++ b/demos/form-builder/app/submit/[slug]/page.tsx
@@ -0,0 +1,103 @@
+"use client";
+
+import { useState } from "react";
+import { useParams, useRouter } from "next/navigation";
+import Link from "next/link";
+import { QueryClientProvider } from "@tanstack/react-query";
+import { StackProvider } from "@btst/stack/context";
+import { FormRenderer } from "@btst/stack/plugins/form-builder/client/components";
+import type { FormBuilderPluginOverrides } from "@btst/stack/plugins/form-builder/client";
+import { getOrCreateQueryClient } from "@/lib/query-client";
+import { ArrowLeft, Loader2, AlertCircle } from "lucide-react";
+
+type PluginOverrides = {
+	"form-builder": FormBuilderPluginOverrides;
+};
+
+export default function PublicFormPage() {
+	const params = useParams();
+	const router = useRouter();
+	const slug = params.slug as string;
+	const [queryClient] = useState(() => getOrCreateQueryClient());
+	const baseURL =
+		typeof window !== "undefined"
+			? window.location.origin
+			: "http://localhost:3000";
+
+	return (
+		<QueryClientProvider client={queryClient}>
+			<StackProvider<PluginOverrides>
+				basePath=""
+				overrides={{
+					"form-builder": {
+						apiBaseURL: baseURL,
+						apiBasePath: "/api/data",
+						navigate: (path) => router.push(path),
+						refresh: () => router.refresh(),
+						Link: ({ href, ...props }) => (
+							<Link href={href || "#"} {...props} />
+						),
+					},
+				}}
+			>
+				<div className="min-h-screen bg-background">
+					<nav className="border-b bg-background sticky top-0 z-50">
+						<div className="max-w-2xl mx-auto px-4 h-14 flex items-center justify-between">
+							<Link
+								href="/pages/forms"
+								className="flex items-center gap-2 text-sm text-muted-foreground hover:text-foreground transition-colors"
+							>
+								<ArrowLeft className="h-4 w-4" />
+								Back to admin
+							</Link>
+							<span className="text-sm font-medium">
+								BTST Form Builder Demo
+							</span>
+						</div>
+					</nav>
+
+					<main className="max-w-2xl mx-auto px-4 py-10">
+						<div className="bg-card rounded-lg border p-6 shadow-sm">
+							<FormRenderer
+								slug={slug}
+								LoadingComponent={FormLoadingState}
+								ErrorComponent={FormErrorState}
+								className="space-y-6"
+							/>
+						</div>
+					</main>
+				</div>
+			</StackProvider>
+		</QueryClientProvider>
+	);
+}
+
+function FormLoadingState() {
+	return (
+		<div className="flex flex-col items-center justify-center py-12 gap-3">
+			<Loader2 className="h-7 w-7 animate-spin text-muted-foreground" />
+			<p className="text-sm text-muted-foreground">Loading form…</p>
+		</div>
+	);
+}
+
+function FormErrorState({ error }: { error: Error }) {
+	return (
+		<div className="flex flex-col items-center justify-center py-12 gap-4 text-center">
+			<AlertCircle className="h-10 w-10 text-destructive" />
+			<div>
+				<h3 className="font-semibold text-base">Form not found</h3>
+				<p className="text-sm text-muted-foreground mt-1">
+					{error?.message ||
+						"This form doesn't exist or is no longer accepting submissions."}
+				</p>
+			</div>
+			<Link
+				href="/pages/forms"
+				className="text-sm text-primary hover:underline"
+			>
+				Browse all forms
+			</Link>
+		</div>
+	);
+}
diff --git a/demos/form-builder/copy-stack-src.mjs b/demos/form-builder/copy-stack-src.mjs
index dc457f0..eca1c4d 100644
--- a/demos/form-builder/copy-stack-src.mjs
+++ b/demos/form-builder/copy-stack-src.mjs
@@ -12,10 +12,10 @@ import { cp, mkdir, rm } from "fs/promises";
 import { existsSync } from "fs";
 
 const src = "node_modules/@btst/stack/src";
-const dest = ".btst-stack-src";
+const dest = "app/.btst-stack-src";
 
 const uiSrc = "node_modules/@btst/stack/dist/packages/ui";
-const uiDest = ".btst-stack-ui";
+const uiDest = "app/.btst-stack-ui";
 
 if (!existsSync(src)) {
 	// Likely running in the monorepo where the workspace symlink does not expose
diff --git a/demos/form-builder/next.config.ts b/demos/form-builder/next.config.ts
index 2e3fbd8..46abc09 100644
--- a/demos/form-builder/next.config.ts
+++ b/demos/form-builder/next.config.ts
@@ -2,9 +2,7 @@ import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
 	async redirects() {
-		return [
-			{ source: "/", destination: "/pages/form-builder", permanent: false },
-		];
+		return [{ source: "/", destination: "/pages/forms", permanent: false }];
 	},
 };
 
diff --git a/demos/kanban/app/globals.css b/demos/kanban/app/globals.css
index f0d3457..b6e5c6c 100644
--- a/demos/kanban/app/globals.css
+++ b/demos/kanban/app/globals.css
@@ -2,15 +2,9 @@
 @import "tw-animate-css";
 @import "@btst/stack/plugins/kanban/css";
 @import "@btst/stack/plugins/route-docs/css";
-/* WebContainers workaround: the WASM Tailwind scanner cannot traverse node_modules
- * (https://github.com/tailwindlabs/tailwindcss/issues/18418). copy-stack-src.mjs
- * (run via predev/prebuild) copies @btst/stack/src outside node_modules so Tailwind
- * can scan it. Safe to remove once the upstream bug is fixed. */
+/* WebContainers workaround: the WASM Tailwind scanner cannot traverse node_modules (https://github.com/tailwindlabs/tailwindcss/issues/18418). copy-stack-src.mjs (run via dev/build) copies @btst/stack/src outside node_modules so Tailwind can scan it. Safe to remove once the upstream bug is fixed. */
 @source "./.btst-stack-src/**/*.{ts,tsx}";
 @source "./.btst-stack-ui/**/*.{ts,tsx}";
-/* Monorepo fallback: direct source path used in local development */
-@source "../../../packages/stack/src/**/*.{ts,tsx}";
-@source "../../../packages/ui/src/**/*.{ts,tsx}";
 
 @custom-variant dark (&:is(.dark *));
 
diff --git a/demos/kanban/copy-stack-src.mjs b/demos/kanban/copy-stack-src.mjs
index dc457f0..eca1c4d 100644
--- a/demos/kanban/copy-stack-src.mjs
+++ b/demos/kanban/copy-stack-src.mjs
@@ -12,10 +12,10 @@ import { cp, mkdir, rm } from "fs/promises";
 import { existsSync } from "fs";
 
 const src = "node_modules/@btst/stack/src";
-const dest = ".btst-stack-src";
+const dest = "app/.btst-stack-src";
 
 const uiSrc = "node_modules/@btst/stack/dist/packages/ui";
-const uiDest = ".btst-stack-ui";
+const uiDest = "app/.btst-stack-ui";
 
 if (!existsSync(src)) {
 	// Likely running in the monorepo where the workspace symlink does not expose
diff --git a/demos/ui-builder/app/globals.css b/demos/ui-builder/app/globals.css
index eaf9e8f..e1c6494 100644
--- a/demos/ui-builder/app/globals.css
+++ b/demos/ui-builder/app/globals.css
@@ -3,15 +3,9 @@
 @import "@btst/stack/plugins/ui-builder/css";
 @import "@btst/stack/plugins/cms/css";
 @import "@btst/stack/plugins/route-docs/css";
-/* WebContainers workaround: the WASM Tailwind scanner cannot traverse node_modules
- * (https://github.com/tailwindlabs/tailwindcss/issues/18418). copy-stack-src.mjs
- * (run via predev/prebuild) copies @btst/stack/src outside node_modules so Tailwind
- * can scan it. Safe to remove once the upstream bug is fixed. */
+/* WebContainers workaround: the WASM Tailwind scanner cannot traverse node_modules (https://github.com/tailwindlabs/tailwindcss/issues/18418). copy-stack-src.mjs (run via dev/build) copies @btst/stack/src outside node_modules so Tailwind can scan it. Safe to remove once the upstream bug is fixed. */
 @source "./.btst-stack-src/**/*.{ts,tsx}";
 @source "./.btst-stack-ui/**/*.{ts,tsx}";
-/* Monorepo fallback: direct source path used in local development */
-@source "../../../packages/stack/src/**/*.{ts,tsx}";
-@source "../../../packages/ui/src/**/*.{ts,tsx}";
 
 @custom-variant dark (&:is(.dark *));
 
diff --git a/demos/ui-builder/app/pages/layout.tsx b/demos/ui-builder/app/pages/layout.tsx
index 546ab68..3c5e1d7 100644
--- a/demos/ui-builder/app/pages/layout.tsx
+++ b/demos/ui-builder/app/pages/layout.tsx
@@ -10,7 +10,7 @@ import { getOrCreateQueryClient } from "@/lib/query-client";
 
 type PluginOverrides = {
 	cms: CMSPluginOverrides;
-	uiBuilder: UIBuilderPluginOverrides;
+	"ui-builder": UIBuilderPluginOverrides;
 };
 
 export default function PagesLayout({
@@ -39,7 +39,7 @@ export default function PagesLayout({
 							<Link href={href || "#"} {...props} />
 						),
 					},
-					uiBuilder: {
+					"ui-builder": {
 						apiBaseURL: baseURL,
 						apiBasePath: "/api/data",
 						navigate: (path) => router.push(path),
diff --git a/demos/ui-builder/copy-stack-src.mjs b/demos/ui-builder/copy-stack-src.mjs
index dc457f0..eca1c4d 100644
--- a/demos/ui-builder/copy-stack-src.mjs
+++ b/demos/ui-builder/copy-stack-src.mjs
@@ -12,10 +12,10 @@ import { cp, mkdir, rm } from "fs/promises";
 import { existsSync } from "fs";
 
 const src = "node_modules/@btst/stack/src";
-const dest = ".btst-stack-src";
+const dest = "app/.btst-stack-src";
 
 const uiSrc = "node_modules/@btst/stack/dist/packages/ui";
-const uiDest = ".btst-stack-ui";
+const uiDest = "app/.btst-stack-ui";
 
 if (!existsSync(src)) {
 	// Likely running in the monorepo where the workspace symlink does not expose
diff --git a/docs/content/docs/demos/form-builder.mdx b/docs/content/docs/demos/form-builder.mdx
index b1f73ea..5a4866d 100644
--- a/docs/content/docs/demos/form-builder.mdx
+++ b/docs/content/docs/demos/form-builder.mdx
@@ -17,7 +17,7 @@ A standalone Next.js demo showcasing the `form-builder` plugin. Two sample forms
 [Open in StackBlitz →](https://stackblitz.com/github/better-stack-ai/better-stack/tree/main/demos/form-builder?startScript=dev&file=lib%2Fstack.ts)
 
 <iframe
-  src="https://stackblitz.com/github/better-stack-ai/better-stack/tree/main/demos/form-builder?startScript=dev&embed=1&file=lib%2Fstack.ts&view=preview&initialPath=%2Fpages%2Fform-builder"
+  src="https://stackblitz.com/github/better-stack-ai/better-stack/tree/main/demos/form-builder?startScript=dev&embed=1&file=lib%2Fstack.ts&view=preview&initialPath=%2Fpages%2Fforms"
   style={{width:"100%", height:"600px", border:"0", borderRadius:"4px"}}
   title="BTST Form Builder Demo"
 />