diff --git a/apps/app/package.json b/apps/app/package.json
index fa64140..16614ca 100644
--- a/apps/app/package.json
+++ b/apps/app/package.json
@@ -10,6 +10,7 @@
     "clean-react": "rm -rf node_modules/react; rm -rf node_modules/react-dom"
   },
   "dependencies": {
+    "@ai-sdk/openai": "^1.1.12",
     "@browserbasehq/sdk": "^2.3.0",
     "@bubba/notifications": "workspace:*",
     "@date-fns/tz": "^1.2.0",
@@ -19,10 +20,14 @@
     "@prisma/instrumentation": "^6.3.1",
     "@tanstack/react-query": "^5.66.0",
     "@tanstack/react-table": "^8.21.2",
+    "@tiptap/pm": "^2.11.5",
+    "@tiptap/react": "^2.11.5",
+    "@tiptap/starter-kit": "^2.11.5",
     "@trigger.dev/react-hooks": "3.3.16",
     "@trigger.dev/sdk": "3.3.16",
     "@uploadthing/react": "^7.2.0",
     "@upstash/ratelimit": "^2.0.5",
+    "ai": "^4.1.41",
     "argon2": "^0.41.1",
     "bun": "^1.2.2",
     "crypto": "^1.0.1",
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/[id]/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/[id]/layout.tsx
index 13e511a..1025ddb 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/[id]/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/[id]/layout.tsx
@@ -20,7 +20,7 @@ export default async function Layout({
   }
 
   return (
-    <div className="max-w-[1200px] space-y-4">
+    <div className="max-w-[1200px] mx-auto">
       <main className="h-[calc(100vh-4rem-4rem)]">{children}</main>
     </div>
   );
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/[id]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/[id]/page.tsx
index 6db6485..72b3dd0 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/[id]/page.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/[id]/page.tsx
@@ -1,5 +1,6 @@
 "use client";
 
+import Tiptap from "@/components/editor/editor";
 import { Button } from "@bubba/ui/button";
 import { Separator } from "@bubba/ui/separator";
 import { useAction } from "next-safe-action/hooks";
@@ -18,6 +19,9 @@ export default function PolicyPage() {
       onSuccess: () => {
         toast.success("Policy published successfully");
       },
+      onError: () => {
+        toast.error("Failed to publish policy, please try again.");
+      },
     },
   );
 
@@ -44,7 +48,7 @@ export default function PolicyPage() {
       <div className="flex-1">
         <div className="min-h-0 h-auto">
           <div className="relative min-h-[calc(100vh-250px)] w-full  mx-auto border border-border bg-background">
-            Editor
+            <Tiptap content={content} />
           </div>
         </div>
       </div>
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/layout.tsx
index 7e72e88..bf11906 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/policies/all/layout.tsx
@@ -10,7 +10,7 @@ export default async function Layout({
   const t = await getI18n();
 
   return (
-    <div className="max-w-[1200px]">
+    <div className="max-w-[1200px] mx-auto">
       <Suspense fallback={<div>Loading...</div>}>
         <SecondaryMenu
           items={[
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/settings/layout.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/settings/layout.tsx
index 3a32de4..eaab6c3 100644
--- a/apps/app/src/app/[locale]/(app)/(dashboard)/settings/layout.tsx
+++ b/apps/app/src/app/[locale]/(app)/(dashboard)/settings/layout.tsx
@@ -10,7 +10,7 @@ export default async function Layout({
   const t = await getI18n();
 
   return (
-    <div className="max-w-[800px] mx-auto">
+    <div className="max-w-[1200px] mx-auto">
       <Suspense fallback={<div>Loading...</div>}>
         <SecondaryMenu
           items={[
diff --git a/apps/app/src/app/api/chat/route.ts b/apps/app/src/app/api/chat/route.ts
new file mode 100644
index 0000000..a73f0c9
--- /dev/null
+++ b/apps/app/src/app/api/chat/route.ts
@@ -0,0 +1,17 @@
+import { openai } from "@ai-sdk/openai";
+import { convertToCoreMessages, streamText } from "ai";
+
+export const maxDuration = 30;
+
+export async function POST(req: Request) {
+  const { messages } = await req.json();
+
+  const result = await streamText({
+    model: openai("gpt-4o-mini"),
+    system:
+      "You generate markdown documents for users. Unless specified, this is a draft. Keep things shortish. Do not add any supplementary text, as everything you say will be placed into a document. If you're confused however, it's okay to ask a user for info. Responses must be either a chat response, or a document. Don't add bold styling to headings.",
+    messages: convertToCoreMessages(messages),
+  });
+
+  return result.toDataStreamResponse();
+}
diff --git a/apps/app/src/components/editor/actions/ai.ts b/apps/app/src/components/editor/actions/ai.ts
new file mode 100644
index 0000000..fe460f0
--- /dev/null
+++ b/apps/app/src/components/editor/actions/ai.ts
@@ -0,0 +1,17 @@
+"use server";
+
+import { openai } from "@ai-sdk/openai";
+import { type CoreMessage, streamText } from "ai";
+import { createStreamableValue } from "ai/rsc";
+
+// Send messages to AI and stream a result back
+export async function continueConversation(messages: CoreMessage[]) {
+  const result = await streamText({
+    model: openai("gpt-4o-mini"),
+    messages,
+  });
+
+  const stream = createStreamableValue(result.textStream);
+  return stream.value;
+}
+
diff --git a/apps/app/src/components/editor/editor.tsx b/apps/app/src/components/editor/editor.tsx
new file mode 100644
index 0000000..dec927b
--- /dev/null
+++ b/apps/app/src/components/editor/editor.tsx
@@ -0,0 +1,22 @@
+"use client";
+
+import { EditorContent, type JSONContent, useEditor } from "@tiptap/react";
+import StarterKit from "@tiptap/starter-kit";
+import { useEffect, useState } from "react";
+
+const Tiptap = ({ content }: { content: JSONContent }) => {
+  const [editorState, setEditorState] = useState<JSONContent | null>(null);
+
+  const editor = useEditor({
+    extensions: [StarterKit],
+    content: content,
+  });
+
+  useEffect(() => {
+    setEditorState(JSON.parse(editor?.getText() || "{}"));
+  }, [editor]);
+
+  return <EditorContent editor={editor} />;
+};
+
+export default Tiptap;
diff --git a/apps/app/src/components/google-sign-in.tsx b/apps/app/src/components/google-sign-in.tsx
index c948336..70c3708 100644
--- a/apps/app/src/components/google-sign-in.tsx
+++ b/apps/app/src/components/google-sign-in.tsx
@@ -24,7 +24,7 @@ export function GoogleSignIn() {
   return (
     <Button
       onClick={handleSignIn}
-      className="flex h-[40px] w-full space-x-2 bg-primary px-6 py-4 font-medium text-secondary active:scale-[0.98]"
+      className="flex h-[40px] w-full space-x-2 px-6 py-4 font-medium active:scale-[0.98]"
     >
       {isLoading ? (
         <Loader2 className="h-4 w-4 animate-spin" />
diff --git a/apps/web/src/app/actions/waitlist.ts b/apps/web/src/app/actions/waitlist.ts
index abf44f9..5960dcd 100644
--- a/apps/web/src/app/actions/waitlist.ts
+++ b/apps/web/src/app/actions/waitlist.ts
@@ -8,53 +8,53 @@ import ky from "ky";
 import { createSafeActionClient } from "next-safe-action";
 import { waitlistSchema } from "./schema";
 
+interface ZapSubscriberPayload {
+  email_address: string;
+  referrer: string;
+}
+
 export const joinWaitlist = createSafeActionClient()
   .schema(waitlistSchema)
   .action(async ({ parsedInput }) => {
+    const kitPayload: ZapSubscriberPayload = {
+      email_address: parsedInput.email,
+      referrer: typeof window !== 'undefined' ? window.location.href : 'https://trycomp.ai',
+    };
+
     if (!resend) {
       throw new Error("Resend not initialized - missing API key");
     }
 
-    const audience = await resend.contacts.list({
-      audienceId: process.env.RESEND_AUDIENCE_ID!,
-    });
-
-    const isInAudience = audience.data?.data?.some(
-      (contact: { email: string }) => contact.email === parsedInput.email,
-    );
-
-    if (!isInAudience) {
-      await resend.contacts.create({
-        email: parsedInput.email,
-        firstName:
-          parsedInput.email.charAt(0).toUpperCase() +
-          parsedInput.email.split("@")[0].slice(1),
-        audienceId: process.env.RESEND_AUDIENCE_ID as string,
+    if (process.env.DISCORD_WEBHOOK_URL) {
+      await ky.post(process.env.DISCORD_WEBHOOK_URL as string, {
+        json: {
+          content: `New waitlist signup: ${parsedInput.email}`,
+        },
       });
-
-      await tasks.trigger<typeof introductionEmailTask>(
-        "introduction-email",
+    }
+    if (process.env.ZAP_WEBHOOK_URL) {
+      const zapPayload: ZapSubscriberPayload = {
+        email_address: parsedInput.email,
+        referrer: typeof window !== 'undefined' ? window.location.href : 'https://trycomp.ai',
+      };
+
+      await ky.post(
+        process.env.ZAP_WEBHOOK_URL as string,
         {
-          email: parsedInput.email,
-        },
-      );
-
-      if (process.env.DISCORD_WEBHOOK_URL) {
-        await ky.post(process.env.DISCORD_WEBHOOK_URL as string, {
-          json: {
-            content: `New waitlist signup: ${parsedInput.email}`,
+          headers: {
+            "Content-Type": "application/json",
+            Accept: "application/json",
           },
-        });
-      }
-
-      await ServerAnalytics.track(parsedInput.email, "waitlist_signup", {
-        channel: "web",
-        email: parsedInput.email,
-      });
-    } else {
-      throw new Error("Email already in audience");
+          json: kitPayload,
+        }
+      );
     }
 
+    await ServerAnalytics.track(parsedInput.email, "waitlist_signup", {
+      channel: "web",
+      email: parsedInput.email,
+    });
+
     return {
       success: true,
     };
diff --git a/bun.lock b/bun.lock
index 9ad04b2..2a4a7b8 100644
--- a/bun.lock
+++ b/bun.lock
@@ -20,6 +20,7 @@
       "name": "comp.ai",
       "version": "0.1.0",
       "dependencies": {
+        "@ai-sdk/openai": "^1.1.12",
         "@browserbasehq/sdk": "^2.3.0",
         "@bubba/notifications": "workspace:*",
         "@date-fns/tz": "^1.2.0",
@@ -29,10 +30,14 @@
         "@prisma/instrumentation": "^6.3.1",
         "@tanstack/react-query": "^5.66.0",
         "@tanstack/react-table": "^8.21.2",
+        "@tiptap/pm": "^2.11.5",
+        "@tiptap/react": "^2.11.5",
+        "@tiptap/starter-kit": "^2.11.5",
         "@trigger.dev/react-hooks": "3.3.16",
         "@trigger.dev/sdk": "3.3.16",
         "@uploadthing/react": "^7.2.0",
         "@upstash/ratelimit": "^2.0.5",
+        "ai": "^4.1.41",
         "argon2": "^0.41.1",
         "bun": "^1.2.2",
         "crypto": "^1.0.1",
@@ -3185,6 +3190,10 @@
 
     "cmdk/react-dom": ["react-dom@18.2.0", "", { "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" }, "peerDependencies": { "react": "^18.2.0" } }, "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g=="],
 
+    "comp.ai/@ai-sdk/openai": ["@ai-sdk/openai@1.1.12", "", { "dependencies": { "@ai-sdk/provider": "1.0.7", "@ai-sdk/provider-utils": "2.1.8" }, "peerDependencies": { "zod": "^3.0.0" } }, "sha512-lh3zN4J/XEqkjpZAOBajSttF1Nl2qV/7WxRbORn+4jZmQkmzWQbsEUpgQ6ME+heyRvnsRCNq3fkMGehWWxWuXg=="],
+
+    "comp.ai/ai": ["ai@4.1.41", "", { "dependencies": { "@ai-sdk/provider": "1.0.7", "@ai-sdk/provider-utils": "2.1.8", "@ai-sdk/react": "1.1.16", "@ai-sdk/ui-utils": "1.1.14", "@opentelemetry/api": "1.9.0", "jsondiffpatch": "0.6.0" }, "peerDependencies": { "react": "^18 || ^19 || ^19.0.0-rc", "zod": "^3.0.0" }, "optionalPeers": ["react", "zod"] }, "sha512-qQ5eVm5ivTij0/auLaoggfW3Y+IgWL0uNCCH79P8eUODeJTTqCRvB0B3iz9xl9b4uqOPcgZCVELgLfVODnCJ9g=="],
+
     "condense-newlines/kind-of": ["kind-of@3.2.2", "", { "dependencies": { "is-buffer": "^1.1.5" } }, "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="],
 
     "data-urls/whatwg-url": ["whatwg-url@14.1.1", "", { "dependencies": { "tr46": "^5.0.0", "webidl-conversions": "^7.0.0" } }, "sha512-mDGf9diDad/giZ/Sm9Xi2YcyzaFpbdLpJPr+E9fSkyQ7KpQD4SdFcugkRQYzhmfI4KeV4Qpnn2sKPdo+kmsgRQ=="],
@@ -3453,6 +3462,18 @@
 
     "cmdk/react-dom/scheduler": ["scheduler@0.23.2", "", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ=="],
 
+    "comp.ai/@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@1.0.7", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-q1PJEZ0qD9rVR+8JFEd01/QM++csMT5UVwYXSN2u54BrVw/D8TZLTeg2FEfKK00DgAx0UtWd8XOhhwITP9BT5g=="],
+
+    "comp.ai/@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@2.1.8", "", { "dependencies": { "@ai-sdk/provider": "1.0.7", "eventsource-parser": "^3.0.0", "nanoid": "^3.3.8", "secure-json-parse": "^2.7.0" }, "peerDependencies": { "zod": "^3.0.0" }, "optionalPeers": ["zod"] }, "sha512-1j9niMUAFlCBdYRYJr1yoB5kwZcRFBVuBiL1hhrf0ONFNrDiJYA6F+gROOuP16NHhezMfTo60+GeeV1xprHFjg=="],
+
+    "comp.ai/ai/@ai-sdk/provider": ["@ai-sdk/provider@1.0.7", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-q1PJEZ0qD9rVR+8JFEd01/QM++csMT5UVwYXSN2u54BrVw/D8TZLTeg2FEfKK00DgAx0UtWd8XOhhwITP9BT5g=="],
+
+    "comp.ai/ai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@2.1.8", "", { "dependencies": { "@ai-sdk/provider": "1.0.7", "eventsource-parser": "^3.0.0", "nanoid": "^3.3.8", "secure-json-parse": "^2.7.0" }, "peerDependencies": { "zod": "^3.0.0" }, "optionalPeers": ["zod"] }, "sha512-1j9niMUAFlCBdYRYJr1yoB5kwZcRFBVuBiL1hhrf0ONFNrDiJYA6F+gROOuP16NHhezMfTo60+GeeV1xprHFjg=="],
+
+    "comp.ai/ai/@ai-sdk/react": ["@ai-sdk/react@1.1.16", "", { "dependencies": { "@ai-sdk/provider-utils": "2.1.8", "@ai-sdk/ui-utils": "1.1.14", "swr": "^2.2.5", "throttleit": "2.1.0" }, "peerDependencies": { "react": "^18 || ^19 || ^19.0.0-rc", "zod": "^3.0.0" }, "optionalPeers": ["react", "zod"] }, "sha512-4Jx1piCte2+YoDd6ZdwM0Mw29046edw7MMNICImCPv2s7sfwFwe4c1t8waA4PYRefuETmzheqjh80kafQYJf8g=="],
+
+    "comp.ai/ai/@ai-sdk/ui-utils": ["@ai-sdk/ui-utils@1.1.14", "", { "dependencies": { "@ai-sdk/provider": "1.0.7", "@ai-sdk/provider-utils": "2.1.8", "zod-to-json-schema": "^3.24.1" }, "peerDependencies": { "zod": "^3.0.0" }, "optionalPeers": ["zod"] }, "sha512-JQXcnPRnDfeH1l503s/8+SxJdmgyUKC3QvKjOpTV6Z/LyRWJZrruBoZnVB1OrL9o/WHEguC+rD+p9udv281KzQ=="],
+
     "data-urls/whatwg-url/tr46": ["tr46@5.0.0", "", { "dependencies": { "punycode": "^2.3.1" } }, "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g=="],
 
     "express/debug/ms": ["ms@2.0.0", "", {}, "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="],
@@ -3535,6 +3556,14 @@
 
     "cmdk/@radix-ui/react-dialog/@radix-ui/react-use-controllable-state/@radix-ui/react-use-callback-ref": ["@radix-ui/react-use-callback-ref@1.0.0", "", { "dependencies": { "@babel/runtime": "^7.13.10" }, "peerDependencies": { "react": "^16.8 || ^17.0 || ^18.0" } }, "sha512-GZtyzoHz95Rhs6S63D2t/eqvdFCm7I+yHMLVQheKM7nBD8mbZIt+ct1jz4536MDnaOGKIxynJ8eHTkVGVVkoTg=="],
 
+    "comp.ai/@ai-sdk/openai/@ai-sdk/provider-utils/eventsource-parser": ["eventsource-parser@3.0.0", "", {}, "sha512-T1C0XCUimhxVQzW4zFipdx0SficT651NnkR0ZSH3yQwh+mFMdLfgjABVi4YtMTtaL4s168593DaoaRLMqryavA=="],
+
+    "comp.ai/@ai-sdk/openai/@ai-sdk/provider-utils/nanoid": ["nanoid@3.3.8", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w=="],
+
+    "comp.ai/ai/@ai-sdk/provider-utils/eventsource-parser": ["eventsource-parser@3.0.0", "", {}, "sha512-T1C0XCUimhxVQzW4zFipdx0SficT651NnkR0ZSH3yQwh+mFMdLfgjABVi4YtMTtaL4s168593DaoaRLMqryavA=="],
+
+    "comp.ai/ai/@ai-sdk/provider-utils/nanoid": ["nanoid@3.3.8", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w=="],
+
     "languine/@trigger.dev/sdk/@trigger.dev/core/@opentelemetry/instrumentation": ["@opentelemetry/instrumentation@0.52.1", "", { "dependencies": { "@opentelemetry/api-logs": "0.52.1", "@types/shimmer": "^1.0.2", "import-in-the-middle": "^1.8.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw=="],
 
     "languine/@trigger.dev/sdk/@trigger.dev/core/eventsource-parser": ["eventsource-parser@3.0.0", "", {}, "sha512-T1C0XCUimhxVQzW4zFipdx0SficT651NnkR0ZSH3yQwh+mFMdLfgjABVi4YtMTtaL4s168593DaoaRLMqryavA=="],
diff --git a/packages/db/prisma/seed.js b/packages/db/prisma/seed.js
index 6ebaf14..63be2ba 100644
--- a/packages/db/prisma/seed.js
+++ b/packages/db/prisma/seed.js
@@ -9,6 +9,21 @@ const node_path_1 = require("node:path");
 const node_fs_2 = __importDefault(require("node:fs"));
 const prisma = new client_1.PrismaClient();
 async function main() {
+    if (process.env.NODE_ENV === "development") {
+        console.log("\n🗑️  Cleaning up existing data...");
+        await prisma.organizationFramework.deleteMany();
+        await prisma.organizationCategory.deleteMany();
+        await prisma.organizationControl.deleteMany();
+        await prisma.organizationPolicy.deleteMany();
+        await prisma.policy.deleteMany();
+        await prisma.policyControl.deleteMany();
+        await prisma.policyFramework.deleteMany();
+        await prisma.control.deleteMany();
+        await prisma.controlRequirement.deleteMany();
+        await prisma.framework.deleteMany();
+        await prisma.frameworkCategory.deleteMany();
+        console.log("✅ Database cleaned");
+    }
     console.log("\n📋 Seeding policies...");
     await seedPolicies();
     console.log("✅ Policies seeded");
@@ -34,25 +49,52 @@ async function seedPolicies() {
     console.log(`📄 Found ${policyFiles.length} policy files to process`);
     for (const file of policyFiles) {
         console.log(`  ⏳ Processing ${file}...`);
-        const policyData = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(policiesDir, file), "utf8"));
-        await prisma.policy.upsert({
-            where: { id: policyData.metadata.id },
-            update: {
-                name: policyData.metadata.name,
-                description: policyData.metadata.description,
-                content: policyData.content,
-                usedBy: policyData.metadata.usedBy,
-            },
-            create: {
-                id: policyData.metadata.id,
-                slug: policyData.metadata.slug,
-                name: policyData.metadata.name,
-                description: policyData.metadata.description,
-                content: policyData.content,
-                usedBy: policyData.metadata.usedBy,
-            },
-        });
-        console.log(`  ✅ ${file} processed`);
+        try {
+            const fileContent = (0, node_fs_1.readFileSync)((0, node_path_1.join)(policiesDir, file), "utf8");
+            const policyData = JSON.parse(fileContent);
+            // Check for any existing policies with the same slug
+            const existingPolicyWithSlug = await prisma.policy.findFirst({
+                where: {
+                    slug: policyData.metadata.slug,
+                    NOT: { id: policyData.metadata.id },
+                },
+            });
+            // If there's a conflict, delete the existing policy
+            if (existingPolicyWithSlug) {
+                console.log(`    ⚠️  Found existing policy with slug "${policyData.metadata.slug}", replacing it...`);
+                await prisma.policy.delete({
+                    where: { id: existingPolicyWithSlug.id },
+                });
+            }
+            // Now we can safely upsert the new policy
+            await prisma.policy.upsert({
+                where: {
+                    id: policyData.metadata.id,
+                },
+                update: {
+                    name: policyData.metadata.name,
+                    slug: policyData.metadata.slug,
+                    description: policyData.metadata.description,
+                    content: policyData.content,
+                    usedBy: policyData.metadata.usedBy,
+                },
+                create: {
+                    id: policyData.metadata.id,
+                    slug: policyData.metadata.slug,
+                    name: policyData.metadata.name,
+                    description: policyData.metadata.description,
+                    content: policyData.content,
+                    usedBy: policyData.metadata.usedBy,
+                },
+            });
+            console.log(`  ✅ ${file} processed`);
+        }
+        catch (error) {
+            console.error(`  ❌ Error processing ${file}:`, error);
+            if (error instanceof Error) {
+                console.error(`     Error details: ${error.message}`);
+            }
+        }
     }
 }
 async function seedFrameworks() {
@@ -120,7 +162,7 @@ async function seedFrameworkCategories(frameworkId) {
 async function seedFrameworkCategoryControls(frameworkId, categoryCode) {
     const controls = node_fs_2.default.readFileSync((0, node_path_1.join)(__dirname, `../../data/controls/${frameworkId}.json`), "utf8");
     const controlsData = JSON.parse(controls);
-    const filteredControlsData = Object.fromEntries(Object.entries(controlsData).filter(([code, data]) => code.includes(categoryCode)));
+    const filteredControlsData = Object.fromEntries(Object.entries(controlsData).filter(([_, data]) => data.categoryId === categoryCode));
     console.log(`        🎮 Processing ${Object.keys(filteredControlsData).length} controls`);
     for (const [controlCode, controlData] of Object.entries(filteredControlsData)) {
         // First, upsert the controls itself for the given category.
diff --git a/packages/ui/src/components/icons.tsx b/packages/ui/src/components/icons.tsx
index bcbebe0..616a740 100644
--- a/packages/ui/src/components/icons.tsx
+++ b/packages/ui/src/components/icons.tsx
@@ -249,23 +249,11 @@ export const Icons = {
       xmlns="http://www.w3.org/2000/svg"
       {...props}
     >
-      <g clipPath="url(#a)">
-        <path
-          d="M10 3.958c1.475 0 2.796.509 3.838 1.5l2.854-2.854C14.959.992 12.696 0 10 0a9.995 9.995 0 0 0-8.933 5.508l3.325 2.58c.787-2.371 3-4.13 5.608-4.13Z"
-          fill="#585858"
-        />
-        <path
-          d="M19.575 10.23c0-.655-.063-1.288-.158-1.897H10v3.759h5.392a4.648 4.648 0 0 1-1.992 2.991l3.22 2.5c1.88-1.741 2.955-4.316 2.955-7.354Z"
-          fill="#878787"
-        />
-        <path
-          d="M4.388 11.912A6.075 6.075 0 0 1 4.07 10c0-.667.112-1.308.317-1.913L1.063 5.508A9.964 9.964 0 0 0 0 10c0 1.617.383 3.142 1.067 4.492l3.32-2.58Z"
-          fill="#D7D7D7"
-        />
-        <path
-          d="M10 20c2.7 0 4.97-.887 6.62-2.42l-3.22-2.5c-.896.603-2.05.958-3.4.958-2.608 0-4.82-1.759-5.612-4.13l-3.325 2.58C2.712 17.758 6.091 20 10 20Z"
-          fill="#B3B3B3"
-        />
+      <g clipPath="url(#a)" fill="currentColor">
+        <path d="M10 3.958c1.475 0 2.796.509 3.838 1.5l2.854-2.854C14.959.992 12.696 0 10 0a9.995 9.995 0 0 0-8.933 5.508l3.325 2.58c.787-2.371 3-4.13 5.608-4.13Z" />
+        <path d="M19.575 10.23c0-.655-.063-1.288-.158-1.897H10v3.759h5.392a4.648 4.648 0 0 1-1.992 2.991l3.22 2.5c1.88-1.741 2.955-4.316 2.955-7.354Z" />
+        <path d="M4.388 11.912A6.075 6.075 0 0 1 4.07 10c0-.667.112-1.308.317-1.913L1.063 5.508A9.964 9.964 0 0 0 0 10c0 1.617.383 3.142 1.067 4.492l3.32-2.58Z" />
+        <path d="M10 20c2.7 0 4.97-.887 6.62-2.42l-3.22-2.5c-.896.603-2.05.958-3.4.958-2.608 0-4.82-1.759-5.612-4.13l-3.325 2.58C2.712 17.758 6.091 20 10 20Z" />
       </g>
       <defs>
         <clipPath id="a">
diff --git a/packages/ui/src/prosemirror.css b/packages/ui/src/prosemirror.css
deleted file mode 100644
index d25365a..0000000
--- a/packages/ui/src/prosemirror.css
+++ /dev/null
@@ -1,383 +0,0 @@
-.ProseMirror .is-editor-empty:first-child::before {
-  content: attr(data-placeholder);
-  float: left;
-  color: hsl(var(--muted-foreground));
-  pointer-events: none;
-  height: 0;
-}
-.ProseMirror .is-empty::before {
-  content: attr(data-placeholder);
-  float: left;
-  color: hsl(var(--muted-foreground));
-  pointer-events: none;
-  height: 0;
-}
-
-/* Custom image styles */
-
-.ProseMirror img {
-  transition: filter 0.1s ease-in-out;
-
-  &:hover {
-    cursor: pointer;
-    filter: brightness(90%);
-  }
-
-  &.ProseMirror-selectednode {
-    outline: 3px solid #5abbf7;
-    filter: brightness(90%);
-  }
-}
-
-.img-placeholder {
-  position: relative;
-
-  &:before {
-    content: "";
-    box-sizing: border-box;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 36px;
-    height: 36px;
-    border-radius: 50%;
-    border: 3px solid var(--novel-stone-200);
-    border-top-color: var(--novel-stone-800);
-    animation: spinning 0.6s linear infinite;
-  }
-}
-
-@keyframes spinning {
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-/* Custom TODO list checkboxes – shoutout to this awesome tutorial: https://moderncss.dev/pure-css-custom-checkbox-style/ */
-
-ul[data-type="taskList"] li > label {
-  margin-right: 0.2rem;
-  user-select: none;
-}
-
-@media screen and (max-width: 768px) {
-  ul[data-type="taskList"] li > label {
-    margin-right: 0.5rem;
-  }
-}
-
-ul[data-type="taskList"] li > label input[type="checkbox"] {
-  -webkit-appearance: none;
-  appearance: none;
-  background-color: hsl(var(--background));
-  margin: 0;
-  cursor: pointer;
-  width: 1.2em;
-  height: 1.2em;
-  position: relative;
-  top: 5px;
-  border: 2px solid hsl(var(--border));
-  margin-right: 0.3rem;
-  display: grid;
-  place-content: center;
-
-  &:hover {
-    background-color: hsl(var(--accent));
-  }
-
-  &:active {
-    background-color: hsl(var(--accent));
-  }
-
-  &::before {
-    content: "";
-    width: 0.65em;
-    height: 0.65em;
-    transform: scale(0);
-    transition: 120ms transform ease-in-out;
-    box-shadow: inset 1em 1em;
-    transform-origin: center;
-    clip-path: polygon(14% 44%, 0 65%, 50% 100%, 100% 16%, 80% 0%, 43% 62%);
-  }
-
-  &:checked::before {
-    transform: scale(1);
-  }
-}
-
-ul[data-type="taskList"] li[data-checked="true"] > div > p {
-  color: var(--muted-foreground);
-  text-decoration: line-through;
-  text-decoration-thickness: 2px;
-}
-
-/* Overwrite tippy-box original max-width */
-
-.tippy-box {
-  max-width: 400px !important;
-}
-
-.ProseMirror:not(.dragging) .ProseMirror-selectednode {
-  outline: none !important;
-  background-color: var(--novel-highlight-blue);
-  transition: background-color 0.2s;
-  box-shadow: none;
-}
-
-.drag-handle {
-  position: fixed;
-  opacity: 1;
-  transition: opacity ease-in 0.2s;
-  border-radius: 0.25rem;
-
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 10 10' style='fill: rgba(0, 0, 0, 0.5)'%3E%3Cpath d='M3,2 C2.44771525,2 2,1.55228475 2,1 C2,0.44771525 2.44771525,0 3,0 C3.55228475,0 4,0.44771525 4,1 C4,1.55228475 3.55228475,2 3,2 Z M3,6 C2.44771525,6 2,5.55228475 2,5 C2,4.44771525 2.44771525,4 3,4 C3.55228475,4 4,4.44771525 4,5 C4,5.55228475 3.55228475,6 3,6 Z M3,10 C2.44771525,10 2,9.55228475 2,9 C2,8.44771525 2.44771525,8 3,8 C3.55228475,8 4,8.44771525 4,9 C4,9.55228475 3.55228475,10 3,10 Z M7,2 C6.44771525,2 6,1.55228475 6,1 C6,0.44771525 6.44771525,0 7,0 C7.55228475,0 8,0.44771525 8,1 C8,1.55228475 7.55228475,2 7,2 Z M7,6 C6.44771525,6 6,5.55228475 6,5 C6,4.44771525 6.44771525,4 7,4 C7.55228475,4 8,4.44771525 8,5 C8,5.55228475 7.55228475,6 7,6 Z M7,10 C6.44771525,10 6,9.55228475 6,9 C6,8.44771525 6.44771525,8 7,8 C7.55228475,8 8,8.44771525 8,9 C8,9.55228475 7.55228475,10 7,10 Z'%3E%3C/path%3E%3C/svg%3E");
-  background-size: calc(0.5em + 0.375rem) calc(0.5em + 0.375rem);
-  background-repeat: no-repeat;
-  background-position: center;
-  width: 1.2rem;
-  height: 1.5rem;
-  z-index: 50;
-  cursor: grab;
-
-  &:hover {
-    background-color: var(--novel-stone-100);
-    transition: background-color 0.2s;
-  }
-
-  &:active {
-    background-color: var(--novel-stone-200);
-    transition: background-color 0.2s;
-    cursor: grabbing;
-  }
-
-  &.hide {
-    opacity: 0;
-    pointer-events: none;
-  }
-
-  @media screen and (max-width: 600px) {
-    display: none;
-    pointer-events: none;
-  }
-}
-
-.dark .drag-handle {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 10 10' style='fill: rgba(255, 255, 255, 0.5)'%3E%3Cpath d='M3,2 C2.44771525,2 2,1.55228475 2,1 C2,0.44771525 2.44771525,0 3,0 C3.55228475,0 4,0.44771525 4,1 C4,1.55228475 3.55228475,2 3,2 Z M3,6 C2.44771525,6 2,5.55228475 2,5 C2,4.44771525 2.44771525,4 3,4 C3.55228475,4 4,4.44771525 4,5 C4,5.55228475 3.55228475,6 3,6 Z M3,10 C2.44771525,10 2,9.55228475 2,9 C2,8.44771525 2.44771525,8 3,8 C3.55228475,8 4,8.44771525 4,9 C4,9.55228475 3.55228475,10 3,10 Z M7,2 C6.44771525,2 6,1.55228475 6,1 C6,0.44771525 6.44771525,0 7,0 C7.55228475,0 8,0.44771525 8,1 C8,1.55228475 7.55228475,2 7,2 Z M7,6 C6.44771525,6 6,5.55228475 6,5 C6,4.44771525 6.44771525,4 7,4 C7.55228475,4 8,4.44771525 8,5 C8,5.55228475 7.55228475,6 7,6 Z M7,10 C6.44771525,10 6,9.55228475 6,9 C6,8.44771525 6.44771525,8 7,8 C7.55228475,8 8,8.44771525 8,9 C8,9.55228475 7.55228475,10 7,10 Z'%3E%3C/path%3E%3C/svg%3E");
-}
-
-
-
-/* === NOVEL ================== */
-
-.ProseMirror {
-  @apply p-12 px-8 sm:px-12;
-}
-
-.ProseMirror .is-editor-empty:first-child::before {
-  content: attr(data-placeholder);
-  float: left;
-  color: hsl(var(--muted-foreground));
-  pointer-events: none;
-  height: 0;
-}
-.ProseMirror .is-empty::before {
-  content: attr(data-placeholder);
-  float: left;
-  color: hsl(var(--muted-foreground));
-  pointer-events: none;
-  height: 0;
-}
-
-/* Custom image styles */
-
-.ProseMirror img {
-  transition: filter 0.1s ease-in-out;
-
-  &:hover {
-    cursor: pointer;
-    filter: brightness(90%);
-  }
-
-  &.ProseMirror-selectednode {
-    outline: 3px solid #5abbf7;
-    filter: brightness(90%);
-  }
-}
-
-.img-placeholder {
-  position: relative;
-
-  &:before {
-    content: "";
-    box-sizing: border-box;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    width: 36px;
-    height: 36px;
-    border-radius: 50%;
-    border: 3px solid var(--novel-stone-200);
-    border-top-color: var(--novel-stone-800);
-    animation: spinning 0.6s linear infinite;
-  }
-}
-
-@keyframes spinning {
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-/* Custom TODO list checkboxes – shoutout to this awesome tutorial: https://moderncss.dev/pure-css-custom-checkbox-style/ */
-
-ul[data-type="taskList"] li > label {
-  margin-right: 0.2rem;
-  user-select: none;
-}
-
-@media screen and (max-width: 768px) {
-  ul[data-type="taskList"] li > label {
-    margin-right: 0.5rem;
-  }
-}
-
-ul[data-type="taskList"] li > label input[type="checkbox"] {
-  -webkit-appearance: none;
-  appearance: none;
-  background-color: hsl(var(--background));
-  margin: 0;
-  cursor: pointer;
-  width: 1.2em;
-  height: 1.2em;
-  position: relative;
-  top: 5px;
-  border: 2px solid hsl(var(--border));
-  margin-right: 0.3rem;
-  display: grid;
-  place-content: center;
-
-  &:hover {
-    background-color: hsl(var(--accent));
-  }
-
-  &:active {
-    background-color: hsl(var(--accent));
-  }
-
-  &::before {
-    content: "";
-    width: 0.65em;
-    height: 0.65em;
-    transform: scale(0);
-    transition: 120ms transform ease-in-out;
-    box-shadow: inset 1em 1em;
-    transform-origin: center;
-    clip-path: polygon(14% 44%, 0 65%, 50% 100%, 100% 16%, 80% 0%, 43% 62%);
-  }
-
-  &:checked::before {
-    transform: scale(1);
-  }
-}
-
-ul[data-type="taskList"] li[data-checked="true"] > div > p {
-  color: var(--muted-foreground);
-  text-decoration: line-through;
-  text-decoration-thickness: 2px;
-}
-
-/* Overwrite tippy-box original max-width */
-
-.tippy-box {
-  max-width: 400px !important;
-}
-
-.ProseMirror:not(.dragging) .ProseMirror-selectednode {
-  outline: none !important;
-  background-color: var(--novel-highlight-blue);
-  transition: background-color 0.2s;
-  box-shadow: none;
-}
-
-.drag-handle {
-  position: fixed;
-  opacity: 1;
-  transition: opacity ease-in 0.2s;
-  border-radius: 0.25rem;
-
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 10 10' style='fill: rgba(0, 0, 0, 0.5)'%3E%3Cpath d='M3,2 C2.44771525,2 2,1.55228475 2,1 C2,0.44771525 2.44771525,0 3,0 C3.55228475,0 4,0.44771525 4,1 C4,1.55228475 3.55228475,2 3,2 Z M3,6 C2.44771525,6 2,5.55228475 2,5 C2,4.44771525 2.44771525,4 3,4 C3.55228475,4 4,4.44771525 4,5 C4,5.55228475 3.55228475,6 3,6 Z M3,10 C2.44771525,10 2,9.55228475 2,9 C2,8.44771525 2.44771525,8 3,8 C3.55228475,8 4,8.44771525 4,9 C4,9.55228475 3.55228475,10 3,10 Z M7,2 C6.44771525,2 6,1.55228475 6,1 C6,0.44771525 6.44771525,0 7,0 C7.55228475,0 8,0.44771525 8,1 C8,1.55228475 7.55228475,2 7,2 Z M7,6 C6.44771525,6 6,5.55228475 6,5 C6,4.44771525 6.44771525,4 7,4 C7.55228475,4 8,4.44771525 8,5 C8,5.55228475 7.55228475,6 7,6 Z M7,10 C6.44771525,10 6,9.55228475 6,9 C6,8.44771525 6.44771525,8 7,8 C7.55228475,8 8,8.44771525 8,9 C8,9.55228475 7.55228475,10 7,10 Z'%3E%3C/path%3E%3C/svg%3E");
-  background-size: calc(0.5em + 0.375rem) calc(0.5em + 0.375rem);
-  background-repeat: no-repeat;
-  background-position: center;
-  width: 1.2rem;
-  height: 1.5rem;
-  z-index: 50;
-  cursor: grab;
-
-  &:hover {
-    background-color: var(--novel-stone-100);
-    transition: background-color 0.2s;
-  }
-
-  &:active {
-    background-color: var(--novel-stone-200);
-    transition: background-color 0.2s;
-    cursor: grabbing;
-  }
-
-  &.hide {
-    opacity: 0;
-    pointer-events: none;
-  }
-
-  @media screen and (max-width: 600px) {
-    display: none;
-    pointer-events: none;
-  }
-}
-
-.dark .drag-handle {
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 10 10' style='fill: rgba(255, 255, 255, 0.5)'%3E%3Cpath d='M3,2 C2.44771525,2 2,1.55228475 2,1 C2,0.44771525 2.44771525,0 3,0 C3.55228475,0 4,0.44771525 4,1 C4,1.55228475 3.55228475,2 3,2 Z M3,6 C2.44771525,6 2,5.55228475 2,5 C2,4.44771525 2.44771525,4 3,4 C3.55228475,4 4,4.44771525 4,5 C4,5.55228475 3.55228475,6 3,6 Z M3,10 C2.44771525,10 2,9.55228475 2,9 C2,8.44771525 2.44771525,8 3,8 C3.55228475,8 4,8.44771525 4,9 C4,9.55228475 3.55228475,10 3,10 Z M7,2 C6.44771525,2 6,1.55228475 6,1 C6,0.44771525 6.44771525,0 7,0 C7.55228475,0 8,0.44771525 8,1 C8,1.55228475 7.55228475,2 7,2 Z M7,6 C6.44771525,6 6,5.55228475 6,5 C6,4.44771525 6.44771525,4 7,4 C7.55228475,4 8,4.44771525 8,5 C8,5.55228475 7.55228475,6 7,6 Z M7,10 C6.44771525,10 6,9.55228475 6,9 C6,8.44771525 6.44771525,8 7,8 C7.55228475,8 8,8.44771525 8,9 C8,9.55228475 7.55228475,10 7,10 Z'%3E%3C/path%3E%3C/svg%3E");
-}
-
-/* Custom Youtube Video CSS */
-iframe {
-  border: 8px solid #ffd00027;
-  border-radius: 4px;
-  min-width: 200px;
-  min-height: 200px;
-  display: block;
-  outline: 0px solid transparent;
-}
-
-div[data-youtube-video] > iframe {
-  cursor: move;
-  aspect-ratio: 16 / 9;
-  width: 100%;
-}
-
-.ProseMirror-selectednode iframe {
-  transition: outline 0.15s;
-  outline: 6px solid #fbbf24;
-}
-
-@media only screen and (max-width: 480px) {
-  div[data-youtube-video] > iframe {
-    max-height: 50px;
-  }
-}
-
-@media only screen and (max-width: 720px) {
-  div[data-youtube-video] > iframe {
-    max-height: 100px;
-  }
-}
-
-/* CSS for bold coloring and highlighting issue*/
-span[style] > strong {
-  color: inherit;
-}
-
-mark[style] > strong {
-  color: inherit;
-}
\ No newline at end of file
diff --git a/packages/ui/src/text-editor.css b/packages/ui/src/text-editor.css
deleted file mode 100644
index 712953a..0000000
--- a/packages/ui/src/text-editor.css
+++ /dev/null
@@ -1,341 +0,0 @@
-/* Placeholder in first line */
-p.tiptap-empty:first-child::before {
-  color: #adb5bd;
-  content: attr(data-placeholder);
-  float: left;
-  height: 0;
-  pointer-events: none;
-}
-
-.tiptap-paragraph {
-  margin: var(--space-8) 0;
-}
-
-.tiptap-hr {
-  margin: var(--space-14) 0;
-  border-bottom: 1px solid var(--color-border);
-}
-
-/* Heading styles below */
-h1.tiptap-heading {
-  font-size: var(--size-3xl);
-  font-weight: bold;
-  margin-top: var(--space-12);
-  margin-bottom: var(--space-8);
-}
-
-h2.tiptap-heading {
-  font-size: var(--size-2xl);
-  font-weight: bold;
-  margin-top: var(--space-12);
-  margin-bottom: var(--space-8);
-}
-
-h3.tiptap-heading {
-  font-size: var(--size-xl);
-  font-weight: bold;
-  margin-top: var(--space-12);
-  margin-bottom: var(--space-8);
-}
-
-h1.tiptap-heading:first-child,
-h2.tiptap-heading:first-child,
-h3.tiptap-heading:first-child {
-  margin-top: 0;
-}
-
-h1.tiptap-heading + h2.tiptap-heading,
-h1.tiptap-heading + h3.tiptap-heading,
-h2.tiptap-heading + h1.tiptap-heading,
-h2.tiptap-heading + h3.tiptap-heading,
-h3.tiptap-heading + h1.tiptap-heading,
-h3.tiptap-heading + h2.tiptap-heading {
-  margin-top: 0;
-}
-
-/* Advanced inline styles below */
-.tiptap-code {
-  font-size: 1.2em;
-  line-height: 1em;
-  background: var(--color-surface-hover);
-  border-radius: var(--radius-xs);
-  font-weight: 400;
-  padding: 0 var(--space-2);
-}
-
-h1 .tiptap-code,
-h2 .tiptap-code,
-h3 .tiptap-code {
-  font-size: 1em;
-}
-
-.tiptap-highlight {
-  background: yellow;
-}
-
-.tiptap-link {
-  color: var(--color-accent);
-  font-weight: 600;
-  cursor: pointer;
-  text-decoration: underline;
-}
-
-/* Block styles below */
-.tiptap-blockquote {
-  margin-left: var(--space-8);
-  padding-left: var(--space-8);
-  display: block;
-  border-left: var(--space-2) solid var(--color-border-contrasted);
-}
-
-.tiptap-list-item p {
-  margin: var(--space-2) 0;
-}
-
-.tiptap-list-item {
-  margin-left: var(--space-12);
-  padding-left: var(--space-2);
-  list-style: disc;
-}
-
-.tiptap-list-item .tiptap-list-item,
-.tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item {
-  margin-left: var(--space-8);
-  list-style: circle;
-}
-
-.tiptap-list-item .tiptap-list-item .tiptap-list-item,
-.tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item {
-  list-style: square;
-}
-
-.tiptap-list-item .tiptap-list-item .tiptap-list-item .tiptap-list-item,
-.tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item {
-  list-style: disc;
-}
-
-.tiptap-ordered-list .tiptap-list-item {
-  list-style: decimal;
-}
-
-.tiptap-ordered-list .tiptap-list-item .tiptap-list-item,
-.tiptap-ordered-list
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item {
-  list-style: lower-alpha;
-}
-
-.tiptap-ordered-list .tiptap-list-item .tiptap-list-item .tiptap-list-item,
-.tiptap-ordered-list
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item {
-  list-style: lower-roman;
-}
-
-.tiptap-ordered-list
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item,
-.tiptap-ordered-list
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item
-  .tiptap-list-item {
-  list-style: decimal;
-}
-
-.tiptap-task-list {
-  list-style: none;
-  padding: 0;
-}
-
-.tiptap-task-list p {
-  margin: 0;
-}
-
-/* Styling for task item in /components/TextEditor/CustomTaskItem */
-
-/* Media blocks below */
-.tiptap-code-block {
-  font-size: var(--size-sm);
-  line-height: 1.6;
-  white-space: pre;
-  background: rgb(var(--color-gray-850));
-  color: rgb(var(--color-gray-100));
-  padding: var(--space-8);
-  border-radius: var(--radius-xs);
-  margin: var(--space-8) 0;
-}
-
-.tiptap-image,
-.tiptap-youtube {
-  margin: var(--space-8) 0;
-}
-
-.tiptap-image.ProseMirror-selectednode,
-.tiptap-youtube.ProseMirror-selectednode {
-  outline: 1.5px solid var(--color-accent);
-}
-
-.tiptap-youtube {
-  border: 0;
-}
-
-/* Give a remote user a caret */
-.collaboration-cursor__caret {
-  border-left: 1px solid #0d0d0d;
-  border-right: 1px solid #0d0d0d;
-  margin-left: -1px;
-  margin-right: -1px;
-  pointer-events: none;
-  position: relative;
-  word-break: normal;
-}
-
-/* Render the username above the caret */
-.collaboration-cursor__label {
-  font-style: normal;
-  font-weight: 600;
-  left: -1px;
-  line-height: normal;
-  position: absolute;
-  user-select: none;
-  white-space: nowrap;
-  font-size: 14px;
-  color: #fff;
-  top: -1.4em;
-  border-radius: 6px;
-  border-bottom-left-radius: 0;
-  padding: 2px 6px;
-  pointer-events: none;
-}
-
-html,
-body {
-  --font-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
-  Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-  font-family: var(--font-sans);
-}
-
-html,
-body,
-#__next {
-  max-width: 100%;
-  min-height: 100vh;
-  overflow: hidden;
-}
-
-html.grabbing {
-  cursor: grabbing;
-}
-
-html.grabbing * {
-  user-select: none;
-}
-
-.lb-root {
-  --lb-foreground: hsl(var(--foreground));
-  --lb-background: hsl(var(--foreground));
-
-  &.lb-elevation,
-  &.lb-tooltip {
-    --lb-background: hsl(var(--foreground));
-  }
-}
-
-.dark .lb-root {
-  --lb-inset-shadow: inset 0 0 0 1px hsl(var(--border));
-}
-
-pre {
-  background: #0d0d0d;
-  border-radius: 0.5rem;
-  color: #fff;
-  font-family: "JetBrainsMono", monospace;
-  padding: 0.75rem 1rem;
-
-  code {
-    background: none;
-    color: inherit;
-    font-size: 0.8rem;
-    padding: 0;
-  }
-
-  .hljs-comment,
-  .hljs-quote {
-    color: #616161;
-  }
-
-  .hljs-variable,
-  .hljs-template-variable,
-  .hljs-attribute,
-  .hljs-tag,
-  .hljs-name,
-  .hljs-regexp,
-  .hljs-link,
-  .hljs-name,
-  .hljs-selector-id,
-  .hljs-selector-class {
-    color: #f98181;
-  }
-
-  .hljs-number,
-  .hljs-meta,
-  .hljs-built_in,
-  .hljs-builtin-name,
-  .hljs-literal,
-  .hljs-type,
-  .hljs-params {
-    color: #fbbc88;
-  }
-
-  .hljs-string,
-  .hljs-symbol,
-  .hljs-bullet {
-    color: #b9f18d;
-  }
-
-  .hljs-title,
-  .hljs-section {
-    color: #faf594;
-  }
-
-  .hljs-keyword,
-  .hljs-selector-tag {
-    color: #70cff8;
-  }
-
-  .hljs-emphasis {
-    font-style: italic;
-  }
-
-  .hljs-strong {
-    font-weight: 700;
-  }
-}
diff --git a/turbo.json b/turbo.json
index 8c0c5b8..f0eefdc 100644
--- a/turbo.json
+++ b/turbo.json
@@ -32,7 +32,8 @@
         "VERCEL_TEAM_ID",
         "VERCEL_PROJECT_ID",
         "NEXT_PUBLIC_VERCEL_URL",
-        "NOVU_API_KEY"
+        "NOVU_API_KEY",
+        "ZAP_WEBHOOK_URL"
       ],
       "inputs": [
         "$TURBO_DEFAULT$",
diff --git a/yarn.lock b/yarn.lock
index c46ca48..f0014f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11,6 +11,14 @@
     "@ai-sdk/provider" "0.0.24"
     "@ai-sdk/provider-utils" "1.0.20"
 
+"@ai-sdk/openai@^1.1.12":
+  version "1.1.12"
+  resolved "https://registry.npmjs.org/@ai-sdk/openai/-/openai-1.1.12.tgz"
+  integrity sha512-lh3zN4J/XEqkjpZAOBajSttF1Nl2qV/7WxRbORn+4jZmQkmzWQbsEUpgQ6ME+heyRvnsRCNq3fkMGehWWxWuXg==
+  dependencies:
+    "@ai-sdk/provider" "1.0.7"
+    "@ai-sdk/provider-utils" "2.1.8"
+
 "@ai-sdk/provider@0.0.24":
   version "0.0.24"
   resolved "https://registry.npmjs.org/@ai-sdk/provider/-/provider-0.0.24.tgz"
@@ -25,6 +33,13 @@
   dependencies:
     json-schema "^0.4.0"
 
+"@ai-sdk/provider@1.0.7":
+  version "1.0.7"
+  resolved "https://registry.npmjs.org/@ai-sdk/provider/-/provider-1.0.7.tgz"
+  integrity sha512-q1PJEZ0qD9rVR+8JFEd01/QM++csMT5UVwYXSN2u54BrVw/D8TZLTeg2FEfKK00DgAx0UtWd8XOhhwITP9BT5g==
+  dependencies:
+    json-schema "^0.4.0"
+
 "@ai-sdk/provider-utils@1.0.20":
   version "1.0.20"
   resolved "https://registry.npmjs.org/@ai-sdk/provider-utils/-/provider-utils-1.0.20.tgz"
@@ -45,6 +60,16 @@
     nanoid "^3.3.7"
     secure-json-parse "^2.7.0"
 
+"@ai-sdk/provider-utils@2.1.8":
+  version "2.1.8"
+  resolved "https://registry.npmjs.org/@ai-sdk/provider-utils/-/provider-utils-2.1.8.tgz"
+  integrity sha512-1j9niMUAFlCBdYRYJr1yoB5kwZcRFBVuBiL1hhrf0ONFNrDiJYA6F+gROOuP16NHhezMfTo60+GeeV1xprHFjg==
+  dependencies:
+    "@ai-sdk/provider" "1.0.7"
+    eventsource-parser "^3.0.0"
+    nanoid "^3.3.8"
+    secure-json-parse "^2.7.0"
+
 "@ai-sdk/react@0.0.70":
   version "0.0.70"
   resolved "https://registry.npmjs.org/@ai-sdk/react/-/react-0.0.70.tgz"
@@ -55,6 +80,16 @@
     swr "^2.2.5"
     throttleit "2.1.0"
 
+"@ai-sdk/react@1.1.16":
+  version "1.1.16"
+  resolved "https://registry.npmjs.org/@ai-sdk/react/-/react-1.1.16.tgz"
+  integrity sha512-4Jx1piCte2+YoDd6ZdwM0Mw29046edw7MMNICImCPv2s7sfwFwe4c1t8waA4PYRefuETmzheqjh80kafQYJf8g==
+  dependencies:
+    "@ai-sdk/provider-utils" "2.1.8"
+    "@ai-sdk/ui-utils" "1.1.14"
+    swr "^2.2.5"
+    throttleit "2.1.0"
+
 "@ai-sdk/solid@0.0.54":
   version "0.0.54"
   resolved "https://registry.npmjs.org/@ai-sdk/solid/-/solid-0.0.54.tgz"
@@ -83,6 +118,15 @@
     secure-json-parse "^2.7.0"
     zod-to-json-schema "^3.23.3"
 
+"@ai-sdk/ui-utils@1.1.14":
+  version "1.1.14"
+  resolved "https://registry.npmjs.org/@ai-sdk/ui-utils/-/ui-utils-1.1.14.tgz"
+  integrity sha512-JQXcnPRnDfeH1l503s/8+SxJdmgyUKC3QvKjOpTV6Z/LyRWJZrruBoZnVB1OrL9o/WHEguC+rD+p9udv281KzQ==
+  dependencies:
+    "@ai-sdk/provider" "1.0.7"
+    "@ai-sdk/provider-utils" "2.1.8"
+    zod-to-json-schema "^3.24.1"
+
 "@ai-sdk/vue@0.0.59":
   version "0.0.59"
   resolved "https://registry.npmjs.org/@ai-sdk/vue/-/vue-0.0.59.tgz"
@@ -3114,7 +3158,7 @@
     prosemirror-transform "^1.10.2"
     prosemirror-view "^1.37.0"
 
-"@tiptap/react@^2.9.1":
+"@tiptap/react@^2.11.5", "@tiptap/react@^2.9.1":
   version "2.11.5"
   resolved "https://registry.npmjs.org/@tiptap/react/-/react-2.11.5.tgz"
   integrity sha512-Dp8eHL1G+R/C4+QzAczyb3t1ovexEIZx9ln7SGEM+cT1KHKAw9XGPRgsp92+NQaYI+EdEb/YqoBOSzQcd18/OQ==
@@ -3125,7 +3169,7 @@
     fast-deep-equal "^3"
     use-sync-external-store "^1"
 
-"@tiptap/starter-kit@^2.9.1":
+"@tiptap/starter-kit@^2.11.5", "@tiptap/starter-kit@^2.9.1":
   version "2.11.5"
   resolved "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-2.11.5.tgz"
   integrity sha512-SLI7Aj2ruU1t//6Mk8f+fqW+18uTqpdfLUJYgwu0CkqBckrkRZYZh6GVLk/02k3H2ki7QkFxiFbZrdbZdng0JA==
@@ -3828,6 +3872,18 @@ ai@^3.4.33:
     secure-json-parse "^2.7.0"
     zod-to-json-schema "^3.23.3"
 
+ai@^4.1.41:
+  version "4.1.41"
+  resolved "https://registry.npmjs.org/ai/-/ai-4.1.41.tgz"
+  integrity sha512-qQ5eVm5ivTij0/auLaoggfW3Y+IgWL0uNCCH79P8eUODeJTTqCRvB0B3iz9xl9b4uqOPcgZCVELgLfVODnCJ9g==
+  dependencies:
+    "@ai-sdk/provider" "1.0.7"
+    "@ai-sdk/provider-utils" "2.1.8"
+    "@ai-sdk/react" "1.1.16"
+    "@ai-sdk/ui-utils" "1.1.14"
+    "@opentelemetry/api" "1.9.0"
+    jsondiffpatch "0.6.0"
+
 ajv@^6.12.3:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
@@ -4537,6 +4593,7 @@ commander@11.1.0:
     tailwindcss "^3.4.17"
     typescript "^5.7.3"
   dependencies:
+    "@ai-sdk/openai" "^1.1.12"
     "@browserbasehq/sdk" "^2.3.0"
     "@bubba/notifications" "workspace:*"
     "@date-fns/tz" "^1.2.0"
@@ -4546,10 +4603,14 @@ commander@11.1.0:
     "@prisma/instrumentation" "^6.3.1"
     "@tanstack/react-query" "^5.66.0"
     "@tanstack/react-table" "^8.21.2"
+    "@tiptap/pm" "^2.11.5"
+    "@tiptap/react" "^2.11.5"
+    "@tiptap/starter-kit" "^2.11.5"
     "@trigger.dev/react-hooks" "3.3.16"
     "@trigger.dev/sdk" "3.3.16"
     "@uploadthing/react" "^7.2.0"
     "@upstash/ratelimit" "^2.0.5"
+    ai "^4.1.41"
     argon2 "^0.41.1"
     bun "^1.2.2"
     crypto "^1.0.1"
@@ -11510,7 +11571,7 @@ zod-error@1.5.0:
   dependencies:
     zod "^3.20.2"
 
-zod-to-json-schema@^3.23.3:
+zod-to-json-schema@^3.23.3, zod-to-json-schema@^3.24.1:
   version "3.24.1"
   resolved "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.1.tgz"
   integrity sha512-3h08nf3Vw3Wl3PK+q3ow/lIil81IT2Oa7YpQyUUDsEWbXveMesdfK1xBd2RhCkynwZndAxixji/7SYJJowr62w==