diff --git a/apps/design/public/email/locusgraph-mark.png b/apps/design/public/email/locusgraph-mark.png
new file mode 100644
index 00000000..faaa4263
Binary files /dev/null and b/apps/design/public/email/locusgraph-mark.png differ
diff --git a/apps/design/public/email/spendgraph-mark.png b/apps/design/public/email/spendgraph-mark.png
new file mode 100644
index 00000000..faaa4263
Binary files /dev/null and b/apps/design/public/email/spendgraph-mark.png differ
diff --git a/apps/design/src/demos/brand/media/email.demo.tsx b/apps/design/src/demos/brand/media/email.demo.tsx
index c603e22c..64e1fce6 100644
--- a/apps/design/src/demos/brand/media/email.demo.tsx
+++ b/apps/design/src/demos/brand/media/email.demo.tsx
@@ -1,14 +1,23 @@
 import {
+  createEmails,
   EmailButton,
   EmailHeading,
   EmailLabel,
   EmailLayout,
   EmailRows,
   EmailText,
+  emailProducts,
+  formatMicroUsd,
   lowCreditsEmail,
 } from "@locusgraph/email";
 import { defineDemo, select } from "../../../registry/define-demo";
 import { EmailFrame, KitPreview, PlainTextPart } from "./email/email-frame";
+import {
+  brandOnceCode,
+  outOfCreditsCode,
+  overrideTextCode,
+  plainTextCode,
+} from "./email/example-code";
 import { emailTemplates, renderSampleEmail, templateCode } from "./email/samples";
 
 const outOfCreditsEmail = lowCreditsEmail({
@@ -36,6 +45,36 @@ function ComposeFromKit() {
   );
 }
 
+const brandedWelcome = createEmails({
+  product: "spendgraph",
+  brand: { name: "Acme Cloud", wordmark: ["acme", "cloud"] },
+  overrides: { welcome: { body: "Connect your first agent to start tracking spend." } },
+}).welcome({
+  userName: "Dana Rivera",
+  dashboardUrl: "https://app.acme.com",
+  docsUrl: "https://docs.acme.com",
+});
+
+function BrandOnce() {
+  return <EmailFrame email={brandedWelcome} />;
+}
+
+const budgetEmail = lowCreditsEmail({
+  organizationName: "Acme Inc",
+  balanceMicroUsd: 2_400_000,
+  buyCreditsUrl: "https://accounts.locusgraph.com/billing/credits",
+  overrides: {
+    heading: "Budget running low",
+    body: (p) =>
+      `${p.organizationName} has ${formatMicroUsd(p.balanceMicroUsd)} left in its budget.`,
+    button: "Add budget",
+  },
+});
+
+function OverrideText() {
+  return <EmailFrame email={budgetEmail} />;
+}
+
 function OutOfCredits() {
   return <EmailFrame email={outOfCreditsEmail} />;
 }
@@ -47,32 +86,97 @@ function PlainText() {
 export default defineDemo({
   title: "Email",
   description:
-    "The branded email kit from @locusgraph/email: a 560px layout with the wordmark, a mono label, a heading, body text, ruled rows and one pill button, all with inline styles from tokens. Each template returns a subject, HTML and a plain text part.",
-  controls: { template: select(emailTemplates, "invitation") },
-  playground: ({ template }) => <EmailFrame email={renderSampleEmail(template)} />,
-  code: ({ template }) =>
-    `import { ${templateCode[template].split("(")[0]} } from "@locusgraph/email";\n\nconst { subject, html, text } = ${templateCode[template]};`,
+    "The branded email kit from @locusgraph/email: a 560px layout with the product mark and wordmark, a mono label, a heading, body text, ruled rows and one pill button, all with inline styles from tokens. Twenty templates cover account, organization, members, keys, billing, usage and agent approval; each returns a subject, HTML and a plain text part. Pass `product`, a `brand` override for the logo, name and wordmark, and `overrides` for any text slot, or set them once with `createEmails`. Every template also gets a raw link under its button and, for security emails, a calm footer.",
+  controls: {
+    template: select(emailTemplates, "invitation"),
+    product: select(emailProducts, "locusgraph"),
+  },
+  playground: ({ template, product }) => (
+    <EmailFrame email={renderSampleEmail(template, product)} />
+  ),
+  code: ({ template, product }) => templateCode(template, product),
   props: [
+    { name: "welcomeEmail", type: "(props: WelcomeEmailProps) => RenderedEmail" },
+    {
+      name: "emailVerificationEmail",
+      type: "(props: EmailVerificationEmailProps) => RenderedEmail",
+    },
+    { name: "paymentFailedEmail", type: "(props: PaymentFailedEmailProps) => RenderedEmail" },
+    { name: "planChangedEmail", type: "(props: PlanChangedEmailProps) => RenderedEmail" },
+    {
+      name: "spendLimitReachedEmail",
+      type: "(props: SpendLimitReachedEmailProps) => RenderedEmail",
+    },
+    {
+      name: "approvalRequestedEmail",
+      type: "(props: ApprovalRequestedEmailProps) => RenderedEmail",
+    },
     { name: "invitationEmail", type: "(props: InvitationEmailProps) => RenderedEmail" },
     { name: "receiptEmail", type: "(props: ReceiptEmailProps) => RenderedEmail" },
     { name: "lowCreditsEmail", type: "(props: LowCreditsEmailProps) => RenderedEmail" },
     { name: "usageOverPlanEmail", type: "(props: UsageOverPlanEmailProps) => RenderedEmail" },
+    { name: "usageWarningEmail", type: "(props: UsageWarningEmailProps) => RenderedEmail" },
+    { name: "usageSummaryEmail", type: "(props: UsageSummaryEmailProps) => RenderedEmail" },
+    {
+      name: "invitationAcceptedEmail",
+      type: "(props: InvitationAcceptedEmailProps) => RenderedEmail",
+    },
+    { name: "roleChangedEmail", type: "(props: RoleChangedEmailProps) => RenderedEmail" },
+    { name: "memberRemovedEmail", type: "(props: MemberRemovedEmailProps) => RenderedEmail" },
+    {
+      name: "ownershipTransferredEmail",
+      type: "(props: OwnershipTransferredEmailProps) => RenderedEmail",
+    },
+    {
+      name: "organizationDeletedEmail",
+      type: "(props: OrganizationDeletedEmailProps) => RenderedEmail",
+    },
+    { name: "keyCreatedEmail", type: "(props: KeyCreatedEmailProps) => RenderedEmail" },
+    { name: "keyRevokedEmail", type: "(props: KeyRevokedEmailProps) => RenderedEmail" },
+    { name: "keyExpiringEmail", type: "(props: KeyExpiringEmailProps) => RenderedEmail" },
+    {
+      name: "product",
+      type: '"locusgraph" | "spendgraph"',
+      defaultValue: '"locusgraph"',
+    },
+    {
+      name: "brand",
+      type: "Partial<{ name; wordmark: [bold, light]; markUrl; markWidth; markHeight }>",
+    },
+    {
+      name: "createEmails",
+      type: "(defaults?: { product?; brand?; overrides? }) => BrandedEmails",
+    },
     { name: "renderEmail", type: "(subject: string, email: ReactElement) => RenderedEmail" },
     { name: "RenderedEmail", type: "{ subject: string; html: string; text: string }" },
   ],
   examples: {
     ComposeFromKit: {
       description:
-        "A new email built from the kit: `EmailLayout`, `EmailLabel`, `EmailHeading`, `EmailText`, `EmailRows` and `EmailButton`, rendered with `renderEmail`.",
+        "A new email built from the kit: `EmailLayout`, `EmailLabel`, `EmailHeading`, `EmailText`, `EmailRows`, `EmailLink` and `EmailButton`, rendered with `renderEmail`.",
       component: ComposeFromKit,
     },
+    BrandOnce: {
+      description:
+        "`createEmails` sets the product, brand and per-template `overrides` once and returns every template under a short name, so `emails.welcome(...)` needs only its own props.",
+      component: BrandOnce,
+      code: brandOnceCode,
+    },
+    OverrideText: {
+      description:
+        "`overrides` replaces any text slot (`label`, `heading`, `body`, `button`, `note`, `footer`, `subject`, `preview`) with a string or a function of the props and `brandName`. Slots left out keep the default; an empty string removes one.",
+      component: OverrideText,
+      code: overrideTextCode,
+    },
     OutOfCredits: {
       description: "`lowCreditsEmail` with a zero balance switches to the out-of-credits copy.",
       component: OutOfCredits,
+      code: outOfCreditsCode,
     },
     PlainText: {
       description: "Every template also renders a plain text part for clients that block HTML.",
       component: PlainText,
+      code: plainTextCode,
     },
   },
   isNew: true,
diff --git a/apps/design/src/demos/brand/media/email/email-frame.tsx b/apps/design/src/demos/brand/media/email/email-frame.tsx
index 0468281c..91a0ddc4 100644
--- a/apps/design/src/demos/brand/media/email/email-frame.tsx
+++ b/apps/design/src/demos/brand/media/email/email-frame.tsx
@@ -1,4 +1,4 @@
-import { type RenderedEmail, renderEmail } from "@locusgraph/email";
+import { emailAssetsOrigin, type RenderedEmail, renderEmail } from "@locusgraph/email";
 import type { ReactElement, SyntheticEvent } from "react";
 
 function fitFrameToEmail(event: SyntheticEvent<HTMLIFrameElement>) {
@@ -10,6 +10,11 @@ function fitFrameToEmail(event: SyntheticEvent<HTMLIFrameElement>) {
 
 const placeholderHeight = 560;
 
+function withLocalAssets(html: string) {
+  if (typeof window === "undefined") return html;
+  return html.replaceAll(emailAssetsOrigin, window.location.origin);
+}
+
 export function EmailFrame({ email }: { email: RenderedEmail }) {
   return (
     <section className="flex w-[40rem] max-w-full flex-col ring-1 ring-border">
@@ -19,7 +24,7 @@ export function EmailFrame({ email }: { email: RenderedEmail }) {
       </div>
       <iframe
         title={email.subject}
-        srcDoc={email.html}
+        srcDoc={withLocalAssets(email.html)}
         className="w-full bg-white"
         style={{ height: placeholderHeight }}
         onLoad={fitFrameToEmail}
diff --git a/apps/design/src/demos/brand/media/email/example-code.ts b/apps/design/src/demos/brand/media/email/example-code.ts
new file mode 100644
index 00000000..d4c9dae4
--- /dev/null
+++ b/apps/design/src/demos/brand/media/email/example-code.ts
@@ -0,0 +1,48 @@
+export const brandOnceCode = `import { createEmails } from "@locusgraph/email";
+
+export const emails = createEmails({
+  product: "spendgraph",
+  brand: { name: "Acme Cloud", wordmark: ["acme", "cloud"] },
+  overrides: {
+    welcome: { body: "Connect your first agent to start tracking spend." },
+  },
+});
+
+const { subject, html, text } = emails.welcome({
+  userName: "Dana Rivera",
+  dashboardUrl: "https://app.acme.com",
+  docsUrl: "https://docs.acme.com",
+});`;
+
+export const overrideTextCode = `import { formatMicroUsd, lowCreditsEmail } from "@locusgraph/email";
+
+const { subject, html, text } = lowCreditsEmail({
+  organizationName: "Acme Inc",
+  balanceMicroUsd: 2_400_000,
+  buyCreditsUrl: "https://accounts.locusgraph.com/billing/credits",
+  overrides: {
+    heading: "Budget running low",
+    body: (p) => \`\${p.organizationName} has \${formatMicroUsd(p.balanceMicroUsd)} left in its budget.\`,
+    button: "Add budget",
+  },
+});`;
+
+export const outOfCreditsCode = `import { lowCreditsEmail } from "@locusgraph/email";
+
+const { subject, html, text } = lowCreditsEmail({
+  organizationName: "Acme Inc",
+  balanceMicroUsd: 0,
+  buyCreditsUrl: "https://accounts.locusgraph.com/billing/credits",
+});`;
+
+export const plainTextCode = `import { receiptEmail } from "@locusgraph/email";
+
+const { subject, html, text } = receiptEmail({
+  organizationName: "Acme Inc",
+  description: "Pro plan, October",
+  amountCents: 4000,
+  paidOn: "Oct 1, 2026",
+  receiptUrl: "https://pay.stripe.com/receipts/example",
+});
+
+await mailer.send({ subject, html, text });`;
diff --git a/apps/design/src/demos/brand/media/email/sample-props.ts b/apps/design/src/demos/brand/media/email/sample-props.ts
new file mode 100644
index 00000000..68538060
--- /dev/null
+++ b/apps/design/src/demos/brand/media/email/sample-props.ts
@@ -0,0 +1,128 @@
+const organizationName = "Acme Inc";
+const keys = {
+  organizationName,
+  keyName: "ci-deploy",
+  keysUrl: "https://accounts.locusgraph.com/keys",
+};
+const quotas = [
+  {
+    key: "locusgraph.memory_writes",
+    label: "Memory writes",
+    used: 124_000,
+    included: 100_000,
+    periodLabel: "this month",
+  },
+  { key: "locusgraph.graphs", label: "Graphs", used: 6, included: 5, periodLabel: "in total" },
+];
+
+export const sampleProps = {
+  welcomeEmail: {
+    userName: "Dana Rivera",
+    dashboardUrl: "https://accounts.locusgraph.com/",
+    docsUrl: "https://docs.locusgraph.com/",
+  },
+  emailVerificationEmail: {
+    code: "482913",
+    verifyUrl: "https://accounts.locusgraph.com/verify/example",
+    expiresInMinutes: 30,
+  },
+  invitationEmail: {
+    organizationName,
+    inviterName: "Dana Rivera",
+    role: "member",
+    acceptUrl: "https://accounts.locusgraph.com/invite/example",
+    expiresOn: "Oct 24, 2026",
+  },
+  invitationAcceptedEmail: {
+    organizationName,
+    memberName: "Sam Lee",
+    role: "admin",
+    membersUrl: "https://accounts.locusgraph.com/members",
+  },
+  roleChangedEmail: {
+    organizationName,
+    role: "admin",
+    changedBy: "Dana Rivera",
+    organizationUrl: "https://accounts.locusgraph.com/",
+  },
+  memberRemovedEmail: { organizationName, removedBy: "Dana Rivera" },
+  ownershipTransferredEmail: {
+    organizationName,
+    previousOwnerName: "Dana Rivera",
+    newOwnerName: "Sam Lee",
+    transferredOn: "Nov 3, 2026",
+    organizationUrl: "https://accounts.locusgraph.com/",
+  },
+  organizationDeletedEmail: {
+    organizationName,
+    deletedBy: "Dana Rivera",
+    deletedOn: "Nov 3, 2026",
+  },
+  keyCreatedEmail: { ...keys, createdBy: "Dana Rivera", createdOn: "Nov 3, 2026" },
+  keyRevokedEmail: { ...keys, revokedBy: "Dana Rivera", revokedOn: "Nov 3, 2026" },
+  keyExpiringEmail: { ...keys, expiresOn: "Nov 10, 2026" },
+  lowCreditsEmail: {
+    organizationName,
+    balanceMicroUsd: 2_400_000,
+    buyCreditsUrl: "https://accounts.locusgraph.com/billing/credits",
+  },
+  receiptEmail: {
+    organizationName,
+    description: "Pro plan, October",
+    amountCents: 4000,
+    paidOn: "Oct 1, 2026",
+    receiptUrl: "https://pay.stripe.com/receipts/example",
+  },
+  paymentFailedEmail: {
+    organizationName,
+    amountCents: 4000,
+    failedOn: "Nov 1, 2026",
+    reason: "Card declined",
+    retryOn: "Nov 4, 2026",
+    billingUrl: "https://accounts.locusgraph.com/billing",
+  },
+  planChangedEmail: {
+    organizationName,
+    previousPlan: "Free",
+    newPlan: "Pro",
+    effectiveOn: "Nov 4, 2026",
+    changedBy: "Dana Rivera",
+    billingUrl: "https://accounts.locusgraph.com/billing",
+  },
+  spendLimitReachedEmail: {
+    organizationName,
+    limitCents: 10_000,
+    reachedOn: "Nov 4, 2026",
+    resetsOn: "Dec 1, 2026",
+    limitsUrl: "https://accounts.locusgraph.com/billing/limits",
+  },
+  approvalRequestedEmail: {
+    organizationName,
+    agentName: "Deploy bot",
+    action: "Delete graph prod-memory",
+    requestedOn: "Nov 4, 2026, 10:42",
+    expiresOn: "Nov 5, 2026, 10:42",
+    reviewUrl: "https://accounts.locusgraph.com/approvals/example",
+  },
+  usageWarningEmail: {
+    organizationName,
+    percentUsed: 80,
+    quotas: quotas.map((quota) => ({ ...quota, used: Math.round(quota.included * 0.8) })),
+    usageUrl: "https://accounts.locusgraph.com/usage",
+  },
+  usageOverPlanEmail: {
+    organizationName,
+    quotas,
+    usageUrl: "https://accounts.locusgraph.com/usage",
+  },
+  usageSummaryEmail: {
+    organizationName,
+    periodLabel: "October 2026",
+    rows: [
+      ["Memory writes", "124,000"],
+      ["Graphs", "6"],
+      ["Credits spent", "$18.40"],
+    ] as [string, string][],
+    usageUrl: "https://accounts.locusgraph.com/usage",
+  },
+};
diff --git a/apps/design/src/demos/brand/media/email/samples.ts b/apps/design/src/demos/brand/media/email/samples.ts
index c4a45d29..cddbb3f4 100644
--- a/apps/design/src/demos/brand/media/email/samples.ts
+++ b/apps/design/src/demos/brand/media/email/samples.ts
@@ -1,94 +1,57 @@
-import {
-  invitationEmail,
-  lowCreditsEmail,
-  type RenderedEmail,
-  receiptEmail,
-  usageOverPlanEmail,
-} from "@locusgraph/email";
+import type { EmailProduct, RenderedEmail } from "@locusgraph/email";
+import * as email from "@locusgraph/email";
+import { sampleProps } from "./sample-props";
 
-export const emailTemplates = ["invitation", "receipt", "low-credits", "usage-over-plan"] as const;
+export const emailTemplates = [
+  "welcome",
+  "email-verification",
+  "invitation",
+  "invitation-accepted",
+  "role-changed",
+  "member-removed",
+  "ownership-transferred",
+  "organization-deleted",
+  "key-created",
+  "key-revoked",
+  "key-expiring",
+  "low-credits",
+  "receipt",
+  "payment-failed",
+  "plan-changed",
+  "usage-warning",
+  "usage-over-plan",
+  "usage-summary",
+  "spend-limit-reached",
+  "approval-requested",
+] as const;
 
 export type EmailTemplate = (typeof emailTemplates)[number];
 
-const renderers: Record<EmailTemplate, () => RenderedEmail> = {
-  invitation: () =>
-    invitationEmail({
-      organizationName: "Acme Inc",
-      inviterName: "Dana Rivera",
-      role: "member",
-      acceptUrl: "https://accounts.locusgraph.com/invite/example",
-      expiresOn: "Oct 24, 2026",
-    }),
-  receipt: () =>
-    receiptEmail({
-      organizationName: "Acme Inc",
-      description: "Pro plan, October",
-      amountCents: 4000,
-      paidOn: "Oct 1, 2026",
-      receiptUrl: "https://pay.stripe.com/receipts/example",
-    }),
-  "low-credits": () =>
-    lowCreditsEmail({
-      organizationName: "Acme Inc",
-      balanceMicroUsd: 2_400_000,
-      buyCreditsUrl: "https://accounts.locusgraph.com/billing/credits",
-    }),
-  "usage-over-plan": () =>
-    usageOverPlanEmail({
-      organizationName: "Acme Inc",
-      quotas: [
-        {
-          key: "locusgraph.memory_writes",
-          label: "Memory writes",
-          used: 124_000,
-          included: 100_000,
-          periodLabel: "this month",
-        },
-        {
-          key: "locusgraph.graphs",
-          label: "Graphs",
-          used: 6,
-          included: 5,
-          periodLabel: "in total",
-        },
-      ],
-      usageUrl: "https://accounts.locusgraph.com/usage",
-    }),
-};
+type TemplateFunction = keyof typeof sampleProps;
 
-const rendered = new Map<EmailTemplate, RenderedEmail>();
+export function functionNameOf(template: EmailTemplate): TemplateFunction {
+  const camel = template.replace(/-(\w)/g, (_, letter: string) => letter.toUpperCase());
+  return `${camel}Email` as TemplateFunction;
+}
+
+const rendered = new Map<string, RenderedEmail>();
 
-export function renderSampleEmail(template: EmailTemplate): RenderedEmail {
-  const cached = rendered.get(template);
+export function renderSampleEmail(
+  template: EmailTemplate,
+  product: EmailProduct = "locusgraph"
+): RenderedEmail {
+  const cacheKey = `${product}:${template}`;
+  const cached = rendered.get(cacheKey);
   if (cached) return cached;
-  const email = renderers[template]();
-  rendered.set(template, email);
-  return email;
+  const name = functionNameOf(template);
+  const render = email[name] as (props: object) => RenderedEmail;
+  const result = render({ ...sampleProps[name], product });
+  rendered.set(cacheKey, result);
+  return result;
 }
 
-export const templateCode: Record<EmailTemplate, string> = {
-  invitation: `invitationEmail({
-  organizationName: "Acme Inc",
-  inviterName: "Dana Rivera",
-  role: "member",
-  acceptUrl,
-  expiresOn: "Oct 24, 2026",
-})`,
-  receipt: `receiptEmail({
-  organizationName: "Acme Inc",
-  description: "Pro plan, October",
-  amountCents: 4000,
-  paidOn: "Oct 1, 2026",
-  receiptUrl,
-})`,
-  "low-credits": `lowCreditsEmail({
-  organizationName: "Acme Inc",
-  balanceMicroUsd: 2_400_000,
-  buyCreditsUrl,
-})`,
-  "usage-over-plan": `usageOverPlanEmail({
-  organizationName: "Acme Inc",
-  quotas: [{ key: "locusgraph.memory_writes", label: "Memory writes", used: 124_000, included: 100_000, periodLabel: "this month" }],
-  usageUrl,
-})`,
-};
+export function templateCode(template: EmailTemplate, product: EmailProduct): string {
+  const name = functionNameOf(template);
+  const props = JSON.stringify({ product, ...sampleProps[name] }, null, 2);
+  return `import { ${name} } from "@locusgraph/email";\n\nconst { subject, html, text } = ${name}(${props});`;
+}
diff --git a/apps/design/src/registry/define-demo.ts b/apps/design/src/registry/define-demo.ts
index ba71b993..3f218962 100644
--- a/apps/design/src/registry/define-demo.ts
+++ b/apps/design/src/registry/define-demo.ts
@@ -22,7 +22,9 @@ export type ControlValues<C extends Controls> = {
 
 export type CompositionNode = { name: string; children?: CompositionNode[] };
 
-export type ExampleDefinition = ComponentType | { description: string; component: ComponentType };
+export type ExampleDefinition =
+  | ComponentType
+  | { description: string; component: ComponentType; code?: string };
 
 export type PreviewHeight = "auto" | "tall";
 
diff --git a/apps/design/src/registry/demo-docs.ts b/apps/design/src/registry/demo-docs.ts
index 1d47b51d..af035357 100644
--- a/apps/design/src/registry/demo-docs.ts
+++ b/apps/design/src/registry/demo-docs.ts
@@ -18,7 +18,7 @@ export function docExamples(demo: Demo, fileSource: string): DocExample[] {
       title: titleFromName(name),
       description: isComponent ? undefined : definition.description,
       component: isComponent ? definition : definition.component,
-      code: extractExampleSource(fileSource, name),
+      code: (isComponent ? undefined : definition.code) ?? extractExampleSource(fileSource, name),
     };
   });
 }
diff --git a/packages/email/README.md b/packages/email/README.md
index 1e080ddc..a8edb51e 100644
--- a/packages/email/README.md
+++ b/packages/email/README.md
@@ -24,9 +24,131 @@ const { subject, html, text } = invitationEmail({
 
 | Function | Sends |
 |---|---|
+| `welcomeEmail` | Welcome after account creation, with a docs link |
+| `emailVerificationEmail` | Verification code and link after signup |
+| `paymentFailedEmail` | A failed charge, with reason and next try |
+| `planChangedEmail` | An upgrade or downgrade |
+| `spendLimitReachedEmail` | Spend limit hit, requests paused |
+| `approvalRequestedEmail` | An agent waiting for a person to approve an action |
 | `invitationEmail` | Invitation to join an organization |
 | `receiptEmail` | A payment receipt, amount in cents |
 | `lowCreditsEmail` | Low or empty wallet, balance in micro-USD |
 | `usageOverPlanEmail` | Quotas over the plan |
+| `usageWarningEmail` | A share of the plan used, before it runs out |
+| `usageSummaryEmail` | A usage summary for a period |
+| `invitationAcceptedEmail` | A member accepted an invitation |
+| `roleChangedEmail` | Your role in an organization changed |
+| `memberRemovedEmail` | You were removed from an organization |
+| `ownershipTransferredEmail` | An organization has a new owner |
+| `organizationDeletedEmail` | An organization was deleted |
+| `keyCreatedEmail` | A new API key was created |
+| `keyRevokedEmail` | An API key was revoked |
+| `keyExpiringEmail` | An API key expires soon |
 
-Each returns `{ subject, html, text }`; pass all three to your mail provider. Build new templates from `EmailLayout`, `EmailLabel`, `EmailHeading`, `EmailText`, `EmailButton` and `EmailRows`, then `renderEmail(subject, element)`.
+Each returns `{ subject, html, text }`; pass all three to your mail provider. The plain text part is written from the same text as the HTML: heading, body, the action link, the facts, then the brand.
+
+## Brand
+
+Every template takes `product` (`"locusgraph"` or `"spendgraph"`, default `"locusgraph"`) and an optional `brand` override, merged over that product's brand. Pass only the fields you want to change:
+
+```ts
+welcomeEmail({
+  product: "spendgraph",
+  brand: { markUrl: "https://cdn.example.com/logo.png", markWidth: 32, markHeight: 32 },
+  userName: "Dana",
+  dashboardUrl,
+  docsUrl,
+});
+```
+
+`name` also changes subjects and text that name the product, and `wordmark` is the bold and light text beside the mark. Host the logo as a PNG on a public URL; most mail clients block SVG.
+
+## Override text
+
+Every template has the same text slots, and `overrides` replaces any of them. Logo and name go in `brand`; words go in `overrides`.
+
+| Slot | Where it shows |
+|---|---|
+| `subject` | Subject line |
+| `preview` | Inbox preview after the subject; says the next step, never repeats the subject |
+| `label` | Small mono label above the heading |
+| `heading` | What happened |
+| `body` | One or two sentences: what it means and what to do |
+| `button` | Button label; an empty string removes the button |
+| `note` | Muted line under the button, with a link when the template has one |
+| `footer` | Line under the panel |
+
+A slot is a string, or a function that gets the template's props plus `brandName`. Slots you leave out keep the default.
+
+```ts
+import { formatMicroUsd, lowCreditsEmail } from "@locusgraph/email";
+
+lowCreditsEmail({
+  organizationName,
+  balanceMicroUsd,
+  buyCreditsUrl,
+  overrides: {
+    heading: "Budget running low",
+    body: (p) => `${p.organizationName} has ${formatMicroUsd(p.balanceMicroUsd)} left in its budget.`,
+    button: "Add budget",
+  },
+});
+```
+
+## Set up once
+
+`createEmails` applies your product, brand and per-template overrides to every template and returns them under short names (`welcome`, `paymentFailed`, `invitation`, ...):
+
+```ts
+// lib/emails.ts
+import { createEmails } from "@locusgraph/email";
+
+export const emails = createEmails({
+  product: "spendgraph",
+  brand: { markUrl: "https://cdn.example.com/mark.png", markWidth: 32, markHeight: 32 },
+  overrides: {
+    welcome: { body: "Connect your first agent to start tracking spend." },
+    lowCredits: { heading: "Budget running low", button: "Add budget" },
+  },
+});
+
+// anywhere you send mail
+const { subject, html, text } = emails.welcome({ userName, dashboardUrl, docsUrl });
+```
+
+A single call can still pass its own `product`, `brand` or `overrides`; they merge over the defaults.
+
+## Standard
+
+Every template follows the same rules, and new ones should too:
+
+- One purpose and at most one button. The raw link prints under every button for clients that hide it.
+- Subject says what happened and names the organization or object; `preview` gives the next step.
+- Body is active voice, present tense, at most two sentences. Name the product through `brandName`, never in fixed text.
+- Facts go in rows (`label: value` in plain text). Optional facts are left out when missing.
+- Security emails (verification, keys, roles, ownership, deletion) end with a calm footer from `securityFooter`.
+
+## Build your own
+
+`defineEmail` gives a new template the same layout, slots, overrides and plain text:
+
+```ts
+import { defineEmail } from "@locusgraph/email";
+
+type GraphReadyData = { graphName: string; graphUrl: string };
+
+export const { Component: GraphReadyEmail, render: graphReadyEmail } = defineEmail<GraphReadyData>({
+  text: {
+    subject: (p) => `${p.graphName} is ready`,
+    preview: "Agents can write to it now",
+    label: "Graphs",
+    heading: (p) => `${p.graphName} is ready`,
+    body: "Agents can now write to it with the key you created.",
+    button: "Open the graph",
+  },
+  actionUrl: (p) => p.graphUrl,
+  rows: (p) => [["Graph", p.graphName]],
+});
+```
+
+For a fully custom layout, compose `EmailLayout`, `EmailLabel`, `EmailHeading`, `EmailText`, `EmailButton`, `EmailLink` and `EmailRows`, then call `renderEmail(subject, element)`.
diff --git a/packages/email/package.json b/packages/email/package.json
index 11aa1065..25cf3e3d 100644
--- a/packages/email/package.json
+++ b/packages/email/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@locusgraph/email",
-  "version": "0.2.2",
-  "description": "LocusGraph transactional emails as React templates with inline styles: invitation, receipt, low credits and usage over plan.",
+  "version": "0.3.0",
+  "description": "LocusGraph and SpendGraph transactional emails as React templates with inline styles: account, organization, members, API keys, billing, usage and agent approval, with a brand override and createEmails.",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/email/src/create-emails.ts b/packages/email/src/create-emails.ts
new file mode 100644
index 00000000..4de25590
--- /dev/null
+++ b/packages/email/src/create-emails.ts
@@ -0,0 +1,50 @@
+import type { WithProduct } from "./kit/brand";
+import type { EmailOverrides } from "./kit/text/overrides";
+import type { RenderedEmail } from "./render";
+import { type EmailTemplateName, emailTemplates } from "./templates/all";
+
+type Templates = typeof emailTemplates;
+
+type PropsOf<Name extends EmailTemplateName> = Parameters<Templates[Name]>[0];
+
+type OverridesOf<Name extends EmailTemplateName> = NonNullable<PropsOf<Name>["overrides"]>;
+
+export type EmailDefaults = WithProduct & {
+  overrides?: { [Name in EmailTemplateName]?: OverridesOf<Name> };
+};
+
+export type BrandedEmails = {
+  [Name in EmailTemplateName]: (
+    props: Omit<PropsOf<Name>, keyof WithProduct> & WithProduct
+  ) => RenderedEmail;
+};
+
+type AnyProps = WithProduct & { overrides?: EmailOverrides<object> };
+
+type AnyTemplate = (props: AnyProps) => RenderedEmail;
+
+function withDefaults(
+  render: AnyTemplate,
+  defaults: WithProduct,
+  templateOverrides: EmailOverrides<object> = {}
+): AnyTemplate {
+  return (props) =>
+    render({
+      ...props,
+      product: props.product ?? defaults.product,
+      brand: { ...defaults.brand, ...props.brand },
+      overrides: { ...templateOverrides, ...props.overrides },
+    });
+}
+
+export function createEmails({ overrides = {}, ...defaults }: EmailDefaults = {}): BrandedEmails {
+  const entries = Object.entries(emailTemplates).map(([name, render]) => [
+    name,
+    withDefaults(
+      render as AnyTemplate,
+      defaults,
+      overrides[name as EmailTemplateName] as EmailOverrides<object> | undefined
+    ),
+  ]);
+  return Object.fromEntries(entries) as BrandedEmails;
+}
diff --git a/packages/email/src/index.ts b/packages/email/src/index.ts
index 0e0b7f34..a4243ac9 100644
--- a/packages/email/src/index.ts
+++ b/packages/email/src/index.ts
@@ -1,7 +1,50 @@
+export { formatCents, formatCount, formatMicroUsd } from "@locusgraph/utils";
+export { type BrandedEmails, createEmails, type EmailDefaults } from "./create-emails";
+export {
+  brandOf,
+  type EmailBrand,
+  type EmailProduct,
+  emailAssetsOrigin,
+  emailProducts,
+  type WithProduct,
+} from "./kit/brand";
 export { EmailLayout } from "./kit/email-layout";
-export { EmailButton, EmailHeading, EmailLabel, EmailRows, EmailText } from "./kit/parts";
+export {
+  EmailButton,
+  EmailHeading,
+  EmailLabel,
+  EmailLink,
+  EmailRows,
+  EmailText,
+} from "./kit/parts";
+export { defineEmail, type EmailDefinition } from "./kit/text/define-email";
+export type {
+  EmailOverrides,
+  SlotText,
+  TextContext,
+  TextSlot,
+  WithOverrides,
+} from "./kit/text/overrides";
+export { securityFooter } from "./kit/text/security";
 export { type RenderedEmail, renderEmail } from "./render";
-export * from "./templates/invitation";
-export * from "./templates/low-credits";
-export * from "./templates/receipt";
-export * from "./templates/usage-over-plan";
+export * from "./templates/account/email-verification";
+export * from "./templates/account/welcome";
+export * from "./templates/agent/approval-requested";
+export { type EmailTemplateName, emailTemplates } from "./templates/all";
+export * from "./templates/billing/low-credits";
+export * from "./templates/billing/payment-failed";
+export * from "./templates/billing/plan-changed";
+export * from "./templates/billing/receipt";
+export * from "./templates/keys/key-created";
+export * from "./templates/keys/key-expiring";
+export * from "./templates/keys/key-revoked";
+export * from "./templates/members/member-removed";
+export * from "./templates/members/role-changed";
+export * from "./templates/org/invitation";
+export * from "./templates/org/invitation-accepted";
+export * from "./templates/org/organization-deleted";
+export * from "./templates/org/ownership-transferred";
+export * from "./templates/usage/spend-limit-reached";
+export * from "./templates/usage/usage-over-plan";
+export * from "./templates/usage/usage-summary";
+export * from "./templates/usage/usage-warning";
diff --git a/packages/email/src/kit/brand.ts b/packages/email/src/kit/brand.ts
new file mode 100644
index 00000000..0658f833
--- /dev/null
+++ b/packages/email/src/kit/brand.ts
@@ -0,0 +1,39 @@
+export const emailProducts = ["locusgraph", "spendgraph"] as const;
+
+export type EmailProduct = (typeof emailProducts)[number];
+
+export type EmailBrand = {
+  name: string;
+  wordmark: [bold: string, light: string];
+  markUrl: string;
+  markWidth: number;
+  markHeight: number;
+};
+
+export type WithProduct = { product?: EmailProduct; brand?: Partial<EmailBrand> };
+
+export const emailAssetsOrigin = "https://design.locusgraph.com";
+
+const productBrands: Record<EmailProduct, EmailBrand> = {
+  locusgraph: {
+    name: "LocusGraph",
+    wordmark: ["locus", "graph"],
+    markUrl: `${emailAssetsOrigin}/email/locusgraph-mark.png`,
+    markWidth: 27,
+    markHeight: 24,
+  },
+  spendgraph: {
+    name: "SpendGraph",
+    wordmark: ["spend", "graph"],
+    markUrl: `${emailAssetsOrigin}/email/spendgraph-mark.png`,
+    markWidth: 27,
+    markHeight: 24,
+  },
+};
+
+export function brandOf(
+  product: EmailProduct = "locusgraph",
+  override: Partial<EmailBrand> = {}
+): EmailBrand {
+  return { ...productBrands[product], ...override };
+}
diff --git a/packages/email/src/kit/email-layout.tsx b/packages/email/src/kit/email-layout.tsx
index 262d9f45..4777c6ec 100644
--- a/packages/email/src/kit/email-layout.tsx
+++ b/packages/email/src/kit/email-layout.tsx
@@ -1,13 +1,23 @@
 import type * as React from "react";
+import { brandOf, type EmailBrand, type EmailProduct } from "./brand";
 import { contentWidth, emailColors, emailFonts } from "./theme";
 
 type EmailLayoutProps = {
   preview: string;
   children: React.ReactNode;
   footer?: React.ReactNode;
+  product?: EmailProduct;
+  brand?: Partial<EmailBrand>;
 };
 
-export function EmailLayout({ preview, children, footer }: EmailLayoutProps) {
+export function EmailLayout({
+  preview,
+  children,
+  footer,
+  product,
+  brand: override,
+}: EmailLayoutProps) {
+  const brand = brandOf(product, override);
   return (
     <html lang="en">
       <head>
@@ -43,11 +53,8 @@ export function EmailLayout({ preview, children, footer }: EmailLayoutProps) {
                 >
                   <tbody>
                     <tr>
-                      <td
-                        style={{ paddingBottom: 16, fontSize: 16, color: emailColors.foreground }}
-                      >
-                        <strong>locus</strong>
-                        <span style={{ fontWeight: 300 }}>graph</span>
+                      <td style={{ paddingBottom: 16 }}>
+                        <BrandHeader brand={brand} />
                       </td>
                     </tr>
                     <tr>
@@ -86,3 +93,28 @@ export function EmailLayout({ preview, children, footer }: EmailLayoutProps) {
     </html>
   );
 }
+
+function BrandHeader({ brand }: { brand: EmailBrand }) {
+  const [bold, light] = brand.wordmark;
+  return (
+    <table role="presentation" cellPadding={0} cellSpacing={0}>
+      <tbody>
+        <tr>
+          <td style={{ paddingRight: 8, verticalAlign: "middle" }}>
+            <img
+              src={brand.markUrl}
+              width={brand.markWidth}
+              height={brand.markHeight}
+              alt=""
+              style={{ display: "block", border: 0 }}
+            />
+          </td>
+          <td style={{ verticalAlign: "middle", fontSize: 16, color: emailColors.foreground }}>
+            <strong>{bold}</strong>
+            <span style={{ fontWeight: 300 }}>{light}</span>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  );
+}
diff --git a/packages/email/src/kit/parts.tsx b/packages/email/src/kit/parts.tsx
index ae321877..a6d728e9 100644
--- a/packages/email/src/kit/parts.tsx
+++ b/packages/email/src/kit/parts.tsx
@@ -1,5 +1,6 @@
 import type * as React from "react";
 import { emailColors, emailFonts } from "./theme";
+import { displayUrl } from "./words";
 
 export function EmailLabel({ children }: { children: React.ReactNode }) {
   return (
@@ -55,27 +56,38 @@ export function EmailText({
 
 export function EmailButton({ href, children }: { href: string; children: React.ReactNode }) {
   return (
-    <table role="presentation" cellPadding={0} cellSpacing={0} style={{ margin: "8px 0 16px" }}>
-      <tbody>
-        <tr>
-          <td style={{ backgroundColor: emailColors.btn, borderRadius: 9999 }}>
-            <a
-              href={href}
-              style={{
-                display: "inline-block",
-                padding: "10px 20px",
-                fontSize: 14,
-                fontWeight: 600,
-                color: emailColors.btnInk,
-                textDecoration: "none",
-              }}
-            >
-              {children}
-            </a>
-          </td>
-        </tr>
-      </tbody>
-    </table>
+    <>
+      <table role="presentation" cellPadding={0} cellSpacing={0} style={{ margin: "8px 0 8px" }}>
+        <tbody>
+          <tr>
+            <td style={{ backgroundColor: emailColors.btn, borderRadius: 9999 }}>
+              <a
+                href={href}
+                style={{
+                  display: "inline-block",
+                  padding: "10px 20px",
+                  fontSize: 14,
+                  fontWeight: 600,
+                  color: emailColors.btnInk,
+                  textDecoration: "none",
+                }}
+              >
+                {children}
+              </a>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      <p
+        data-link-fallback=""
+        style={{ margin: "0 0 16px", fontSize: 12, color: emailColors.mutedForeground }}
+      >
+        Or open:{" "}
+        <a href={href} style={{ color: emailColors.mutedForeground }}>
+          {displayUrl(href)}
+        </a>
+      </p>
+    </>
   );
 }
 
@@ -117,3 +129,11 @@ export function EmailRows({ rows }: { rows: [label: string, value: string][] })
     </table>
   );
 }
+
+export function EmailLink({ href, children }: { href: string; children: React.ReactNode }) {
+  return (
+    <a href={href} style={{ color: emailColors.foreground, textDecoration: "underline" }}>
+      {children}
+    </a>
+  );
+}
diff --git a/packages/email/src/kit/text/define-email.tsx b/packages/email/src/kit/text/define-email.tsx
new file mode 100644
index 00000000..e1800e3c
--- /dev/null
+++ b/packages/email/src/kit/text/define-email.tsx
@@ -0,0 +1,83 @@
+import { renderToStaticMarkup } from "react-dom/server";
+import type { RenderedEmail } from "../../render";
+import { brandOf } from "../brand";
+import { EmailLayout } from "../email-layout";
+import { EmailButton, EmailHeading, EmailLabel, EmailLink, EmailRows, EmailText } from "../parts";
+import { displayUrl } from "../words";
+import { type DefaultText, resolveText, type WithOverrides } from "./overrides";
+import { plainTextOf, type ResolvedEmail } from "./plain-text";
+
+type Row = [label: string, value: string | undefined];
+
+export type EmailDefinition<Data> = {
+  text: DefaultText<Data>;
+  actionUrl?: (props: Data) => string;
+  rows?: (props: Data) => Row[];
+  noteUrl?: (props: Data) => string;
+};
+
+function hasValue(row: Row): row is [string, string] {
+  return row[1] !== undefined;
+}
+
+function resolveEmail<Data>(
+  definition: EmailDefinition<Data>,
+  props: WithOverrides<Data>
+): ResolvedEmail {
+  const brandName = brandOf(props.product, props.brand).name;
+  return {
+    text: resolveText(definition.text, props, brandName),
+    brandName,
+    actionUrl: definition.actionUrl?.(props),
+    rows: (definition.rows?.(props) ?? []).filter(hasValue),
+    noteUrl: definition.noteUrl?.(props),
+  };
+}
+
+function EmailBody({ email }: { email: ResolvedEmail }) {
+  const { text, actionUrl, rows, noteUrl } = email;
+  return (
+    <>
+      <EmailLabel>{text.label}</EmailLabel>
+      <EmailHeading>{text.heading}</EmailHeading>
+      <EmailText>{text.body}</EmailText>
+      {rows.length > 0 && <EmailRows rows={rows} />}
+      {actionUrl && text.button && <EmailButton href={actionUrl}>{text.button}</EmailButton>}
+      {text.note && (
+        <EmailText muted>
+          {text.note}
+          {noteUrl && (
+            <>
+              {" "}
+              <EmailLink href={noteUrl}>{displayUrl(noteUrl)}</EmailLink>
+            </>
+          )}
+        </EmailText>
+      )}
+    </>
+  );
+}
+
+export function defineEmail<Data>(definition: EmailDefinition<Data>) {
+  function Component(props: WithOverrides<Data>) {
+    const email = resolveEmail(definition, props);
+    return (
+      <EmailLayout
+        product={props.product}
+        brand={props.brand}
+        preview={email.text.preview}
+        footer={email.text.footer || undefined}
+      >
+        <EmailBody email={email} />
+      </EmailLayout>
+    );
+  }
+
+  function render(props: WithOverrides<Data>): RenderedEmail {
+    const email = resolveEmail(definition, props);
+    const html = `<!DOCTYPE html>${renderToStaticMarkup(<Component {...props} />)}`;
+    return { subject: email.text.subject, html, text: plainTextOf(email) };
+  }
+
+  return { Component, render };
+}
diff --git a/packages/email/src/kit/text/overrides.ts b/packages/email/src/kit/text/overrides.ts
new file mode 100644
index 00000000..7ea69120
--- /dev/null
+++ b/packages/email/src/kit/text/overrides.ts
@@ -0,0 +1,50 @@
+import type { WithProduct } from "../brand";
+
+export type TextSlot =
+  | "label"
+  | "heading"
+  | "body"
+  | "button"
+  | "note"
+  | "footer"
+  | "subject"
+  | "preview";
+
+const textSlots: TextSlot[] = [
+  "label",
+  "heading",
+  "body",
+  "button",
+  "note",
+  "footer",
+  "subject",
+  "preview",
+];
+
+export type TextContext<Data> = Data & { brandName: string };
+
+export type SlotText<Data> = string | ((props: TextContext<Data>) => string);
+
+export type EmailOverrides<Data> = Partial<Record<TextSlot, SlotText<Data>>>;
+
+type RequiredSlot = "label" | "heading" | "body" | "subject" | "preview";
+
+export type DefaultText<Data> = EmailOverrides<Data> & Record<RequiredSlot, SlotText<Data>>;
+
+export type WithOverrides<Data> = Data & WithProduct & { overrides?: EmailOverrides<Data> };
+
+export type ResolvedText = Record<TextSlot, string>;
+
+export function resolveText<Data>(
+  defaults: DefaultText<Data>,
+  props: WithOverrides<Data>,
+  brandName: string
+): ResolvedText {
+  const context = { ...props, brandName } as TextContext<Data>;
+  const slots: EmailOverrides<Data> = { ...defaults, ...props.overrides };
+  const entries = textSlots.map((slot) => {
+    const value = slots[slot];
+    return [slot, typeof value === "function" ? value(context) : (value ?? "")];
+  });
+  return Object.fromEntries(entries) as ResolvedText;
+}
diff --git a/packages/email/src/kit/text/plain-text.ts b/packages/email/src/kit/text/plain-text.ts
new file mode 100644
index 00000000..55ad6c83
--- /dev/null
+++ b/packages/email/src/kit/text/plain-text.ts
@@ -0,0 +1,31 @@
+import type { ResolvedText } from "./overrides";
+
+export type ResolvedEmail = {
+  text: ResolvedText;
+  brandName: string;
+  actionUrl?: string;
+  rows: [label: string, value: string][];
+  noteUrl?: string;
+};
+
+function actionLine({ text, actionUrl }: ResolvedEmail) {
+  return actionUrl && text.button ? `${text.button}: ${actionUrl}` : "";
+}
+
+function noteLine({ text, noteUrl }: ResolvedEmail) {
+  return text.note ? [text.note, noteUrl].filter(Boolean).join(" ") : "";
+}
+
+export function plainTextOf(email: ResolvedEmail): string {
+  return [
+    email.text.heading,
+    email.text.body,
+    actionLine(email),
+    email.rows.map(([label, value]) => `${label}: ${value}`).join("\n"),
+    noteLine(email),
+    email.text.footer,
+    `—\n${email.brandName}`,
+  ]
+    .filter(Boolean)
+    .join("\n\n");
+}
diff --git a/packages/email/src/kit/text/security.ts b/packages/email/src/kit/text/security.ts
new file mode 100644
index 00000000..81872ca1
--- /dev/null
+++ b/packages/email/src/kit/text/security.ts
@@ -0,0 +1,3 @@
+export function securityFooter({ brandName }: { brandName: string }) {
+  return `If you did not expect this, reply to this email to reach ${brandName} support.`;
+}
diff --git a/packages/email/src/kit/words.ts b/packages/email/src/kit/words.ts
new file mode 100644
index 00000000..06223ef9
--- /dev/null
+++ b/packages/email/src/kit/words.ts
@@ -0,0 +1,9 @@
+export function withIndefiniteArticle(word: string) {
+  return /^[aeiou]/i.test(word) ? `an ${word}` : `a ${word}`;
+}
+
+export function displayUrl(href: string) {
+  if (!URL.canParse(href)) return href;
+  const url = new URL(href);
+  return `${url.host}${url.pathname}`.replace(/\/$/, "");
+}
diff --git a/packages/email/src/render.ts b/packages/email/src/render.ts
index a317e07a..34b0d226 100644
--- a/packages/email/src/render.ts
+++ b/packages/email/src/render.ts
@@ -6,6 +6,7 @@ export type RenderedEmail = { subject: string; html: string; text: string };
 function plainText(html: string): string {
   return html
     .replace(/<div style="display:none[^>]*>[\s\S]*?<\/div>/, "")
+    .replace(/<p data-link-fallback[^>]*>[\s\S]*?<\/p>/g, "")
     .replace(/<a [^>]*href="([^"]+)"[^>]*>([\s\S]*?)<\/a>/g, "$2: $1")
     .replace(/<\/(p|h1|tr|table)>/g, "\n")
     .replace(/<\/td>/g, " ")
diff --git a/packages/email/src/templates/account/email-verification.tsx b/packages/email/src/templates/account/email-verification.tsx
new file mode 100644
index 00000000..039615a2
--- /dev/null
+++ b/packages/email/src/templates/account/email-verification.tsx
@@ -0,0 +1,25 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+
+export type EmailVerificationEmailData = {
+  code: string;
+  verifyUrl: string;
+  expiresInMinutes: number;
+};
+
+export type EmailVerificationEmailProps = WithOverrides<EmailVerificationEmailData>;
+
+export const { Component: EmailVerificationEmail, render: emailVerificationEmail } =
+  defineEmail<EmailVerificationEmailData>({
+    text: {
+      subject: (p) => `${p.code} is your ${p.brandName} verification code`,
+      preview: "Confirm your email to finish creating your account",
+      label: "Account",
+      heading: "Confirm your email",
+      body: (p) => `Confirm this address to finish creating your ${p.brandName} account.`,
+      button: "Verify email",
+      note: (p) => `Or enter the code ${p.code}. It expires in ${p.expiresInMinutes} minutes.`,
+      footer: (p) => `If you did not sign up for ${p.brandName}, you can ignore this email.`,
+    },
+    actionUrl: (p) => p.verifyUrl,
+  });
diff --git a/packages/email/src/templates/account/welcome.tsx b/packages/email/src/templates/account/welcome.tsx
new file mode 100644
index 00000000..f55f03ae
--- /dev/null
+++ b/packages/email/src/templates/account/welcome.tsx
@@ -0,0 +1,25 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+
+export type WelcomeEmailData = {
+  userName: string;
+  dashboardUrl: string;
+  docsUrl: string;
+};
+
+export type WelcomeEmailProps = WithOverrides<WelcomeEmailData>;
+
+export const { Component: WelcomeEmail, render: welcomeEmail } = defineEmail<WelcomeEmailData>({
+  text: {
+    subject: (p) => `Welcome to ${p.brandName}`,
+    preview: "Open the dashboard to get started",
+    label: "Account",
+    heading: (p) => `Welcome, ${p.userName}`,
+    body: (p) =>
+      `Your ${p.brandName} account is ready. Open the dashboard to create your first API key and start building.`,
+    button: "Open dashboard",
+    note: (p) => `New to ${p.brandName}? Read the docs for a quick start and guides:`,
+  },
+  actionUrl: (p) => p.dashboardUrl,
+  noteUrl: (p) => p.docsUrl,
+});
diff --git a/packages/email/src/templates/agent/approval-requested.tsx b/packages/email/src/templates/agent/approval-requested.tsx
new file mode 100644
index 00000000..2eef4468
--- /dev/null
+++ b/packages/email/src/templates/agent/approval-requested.tsx
@@ -0,0 +1,33 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+
+export type ApprovalRequestedEmailData = {
+  organizationName: string;
+  agentName: string;
+  action: string;
+  requestedOn: string;
+  expiresOn?: string;
+  reviewUrl: string;
+};
+
+export type ApprovalRequestedEmailProps = WithOverrides<ApprovalRequestedEmailData>;
+
+export const { Component: ApprovalRequestedEmail, render: approvalRequestedEmail } =
+  defineEmail<ApprovalRequestedEmailData>({
+    text: {
+      subject: (p) => `${p.agentName} is waiting for your approval`,
+      preview: (p) => `Review the action: ${p.action}`,
+      label: "Approval",
+      heading: (p) => `${p.agentName} needs approval`,
+      body: (p) =>
+        `An agent in ${p.organizationName} paused before an action that needs a person to approve it. Nothing runs until you approve or deny it.`,
+      button: "Review request",
+    },
+    actionUrl: (p) => p.reviewUrl,
+    rows: (p) => [
+      ["Agent", p.agentName],
+      ["Action", p.action],
+      ["Requested", p.requestedOn],
+      ["Expires", p.expiresOn],
+    ],
+  });
diff --git a/packages/email/src/templates/all.ts b/packages/email/src/templates/all.ts
new file mode 100644
index 00000000..b8ecde0f
--- /dev/null
+++ b/packages/email/src/templates/all.ts
@@ -0,0 +1,45 @@
+import { emailVerificationEmail } from "./account/email-verification";
+import { welcomeEmail } from "./account/welcome";
+import { approvalRequestedEmail } from "./agent/approval-requested";
+import { lowCreditsEmail } from "./billing/low-credits";
+import { paymentFailedEmail } from "./billing/payment-failed";
+import { planChangedEmail } from "./billing/plan-changed";
+import { receiptEmail } from "./billing/receipt";
+import { keyCreatedEmail } from "./keys/key-created";
+import { keyExpiringEmail } from "./keys/key-expiring";
+import { keyRevokedEmail } from "./keys/key-revoked";
+import { memberRemovedEmail } from "./members/member-removed";
+import { roleChangedEmail } from "./members/role-changed";
+import { invitationEmail } from "./org/invitation";
+import { invitationAcceptedEmail } from "./org/invitation-accepted";
+import { organizationDeletedEmail } from "./org/organization-deleted";
+import { ownershipTransferredEmail } from "./org/ownership-transferred";
+import { spendLimitReachedEmail } from "./usage/spend-limit-reached";
+import { usageOverPlanEmail } from "./usage/usage-over-plan";
+import { usageSummaryEmail } from "./usage/usage-summary";
+import { usageWarningEmail } from "./usage/usage-warning";
+
+export const emailTemplates = {
+  welcome: welcomeEmail,
+  emailVerification: emailVerificationEmail,
+  invitation: invitationEmail,
+  invitationAccepted: invitationAcceptedEmail,
+  roleChanged: roleChangedEmail,
+  memberRemoved: memberRemovedEmail,
+  ownershipTransferred: ownershipTransferredEmail,
+  organizationDeleted: organizationDeletedEmail,
+  keyCreated: keyCreatedEmail,
+  keyRevoked: keyRevokedEmail,
+  keyExpiring: keyExpiringEmail,
+  lowCredits: lowCreditsEmail,
+  receipt: receiptEmail,
+  paymentFailed: paymentFailedEmail,
+  planChanged: planChangedEmail,
+  usageWarning: usageWarningEmail,
+  usageOverPlan: usageOverPlanEmail,
+  usageSummary: usageSummaryEmail,
+  spendLimitReached: spendLimitReachedEmail,
+  approvalRequested: approvalRequestedEmail,
+};
+
+export type EmailTemplateName = keyof typeof emailTemplates;
diff --git a/packages/email/src/templates/billing/low-credits.tsx b/packages/email/src/templates/billing/low-credits.tsx
new file mode 100644
index 00000000..2119c0b9
--- /dev/null
+++ b/packages/email/src/templates/billing/low-credits.tsx
@@ -0,0 +1,36 @@
+import { formatMicroUsd } from "@locusgraph/utils";
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+
+export type LowCreditsEmailData = {
+  organizationName: string;
+  balanceMicroUsd: number;
+  buyCreditsUrl: string;
+};
+
+export type LowCreditsEmailProps = WithOverrides<LowCreditsEmailData>;
+
+const isEmpty = (p: LowCreditsEmailData) => p.balanceMicroUsd <= 0;
+
+export const { Component: LowCreditsEmail, render: lowCreditsEmail } =
+  defineEmail<LowCreditsEmailData>({
+    text: {
+      subject: (p) =>
+        isEmpty(p)
+          ? `You are out of credits on ${p.organizationName}`
+          : `Your credits are running low on ${p.organizationName}`,
+      preview: (p) =>
+        isEmpty(p)
+          ? "Paid usage is paused until you add credits"
+          : "Add credits so paid usage does not stop",
+      label: "Credits",
+      heading: (p) =>
+        isEmpty(p) ? "Out of credits" : `${formatMicroUsd(p.balanceMicroUsd)} of credits left`,
+      body: (p) =>
+        isEmpty(p)
+          ? `Paid usage for ${p.organizationName} is paused until you add credits.`
+          : `Add credits so paid usage for ${p.organizationName} does not stop.`,
+      button: "Buy credits",
+    },
+    actionUrl: (p) => p.buyCreditsUrl,
+  });
diff --git a/packages/email/src/templates/billing/payment-failed.tsx b/packages/email/src/templates/billing/payment-failed.tsx
new file mode 100644
index 00000000..1c8c6aaf
--- /dev/null
+++ b/packages/email/src/templates/billing/payment-failed.tsx
@@ -0,0 +1,34 @@
+import { formatCents } from "@locusgraph/utils";
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+
+export type PaymentFailedEmailData = {
+  organizationName: string;
+  amountCents: number;
+  failedOn: string;
+  reason?: string;
+  retryOn?: string;
+  billingUrl: string;
+};
+
+export type PaymentFailedEmailProps = WithOverrides<PaymentFailedEmailData>;
+
+export const { Component: PaymentFailedEmail, render: paymentFailedEmail } =
+  defineEmail<PaymentFailedEmailData>({
+    text: {
+      subject: (p) => `Payment failed for ${p.organizationName}`,
+      preview: "Update your payment method to keep your plan active",
+      label: "Billing",
+      heading: "Payment failed",
+      body: (p) =>
+        `We could not charge ${formatCents(p.amountCents)} for ${p.organizationName}. Update the payment method to keep the plan active.`,
+      button: "Update payment",
+    },
+    actionUrl: (p) => p.billingUrl,
+    rows: (p) => [
+      ["Amount", formatCents(p.amountCents)],
+      ["Date", p.failedOn],
+      ["Reason", p.reason],
+      ["Next try", p.retryOn],
+    ],
+  });
diff --git a/packages/email/src/templates/billing/plan-changed.tsx b/packages/email/src/templates/billing/plan-changed.tsx
new file mode 100644
index 00000000..00451215
--- /dev/null
+++ b/packages/email/src/templates/billing/plan-changed.tsx
@@ -0,0 +1,32 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+
+export type PlanChangedEmailData = {
+  organizationName: string;
+  previousPlan: string;
+  newPlan: string;
+  effectiveOn: string;
+  changedBy: string;
+  billingUrl: string;
+};
+
+export type PlanChangedEmailProps = WithOverrides<PlanChangedEmailData>;
+
+export const { Component: PlanChangedEmail, render: planChangedEmail } =
+  defineEmail<PlanChangedEmailData>({
+    text: {
+      subject: (p) => `${p.organizationName} plan changed to ${p.newPlan}`,
+      preview: (p) => `New limits and price apply from ${p.effectiveOn}`,
+      label: "Billing",
+      heading: (p) => `Plan changed to ${p.newPlan}`,
+      body: (p) =>
+        `${p.changedBy} changed the plan for ${p.organizationName}. Limits and price follow the new plan from ${p.effectiveOn}.`,
+      button: "See billing",
+    },
+    actionUrl: (p) => p.billingUrl,
+    rows: (p) => [
+      ["Previous plan", p.previousPlan],
+      ["New plan", p.newPlan],
+      ["Takes effect", p.effectiveOn],
+    ],
+  });
diff --git a/packages/email/src/templates/billing/receipt.tsx b/packages/email/src/templates/billing/receipt.tsx
new file mode 100644
index 00000000..4955b936
--- /dev/null
+++ b/packages/email/src/templates/billing/receipt.tsx
@@ -0,0 +1,31 @@
+import { formatCents } from "@locusgraph/utils";
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+
+export type ReceiptEmailData = {
+  organizationName: string;
+  description: string;
+  amountCents: number;
+  paidOn: string;
+  receiptUrl: string;
+};
+
+export type ReceiptEmailProps = WithOverrides<ReceiptEmailData>;
+
+export const { Component: ReceiptEmail, render: receiptEmail } = defineEmail<ReceiptEmailData>({
+  text: {
+    subject: (p) => `Receipt: ${formatCents(p.amountCents)} for ${p.organizationName}`,
+    preview: (p) => `${p.description}, paid on ${p.paidOn}`,
+    label: "Receipt",
+    heading: (p) => `${formatCents(p.amountCents)} paid`,
+    body: (p) => `Thanks. Here is what ${p.organizationName} paid for.`,
+    button: "View receipt",
+    footer: "Stripe processed this payment. The receipt link shows the full invoice.",
+  },
+  actionUrl: (p) => p.receiptUrl,
+  rows: (p) => [
+    ["Item", p.description],
+    ["Date", p.paidOn],
+    ["Total", formatCents(p.amountCents)],
+  ],
+});
diff --git a/packages/email/src/templates/invitation.tsx b/packages/email/src/templates/invitation.tsx
deleted file mode 100644
index 33b498fc..00000000
--- a/packages/email/src/templates/invitation.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { EmailLayout } from "../kit/email-layout";
-import { EmailButton, EmailHeading, EmailLabel, EmailText } from "../kit/parts";
-import { renderEmail } from "../render";
-
-export type InvitationEmailProps = {
-  organizationName: string;
-  inviterName: string;
-  role: string;
-  acceptUrl: string;
-  expiresOn: string;
-};
-
-function withIndefiniteArticle(word: string) {
-  return /^[aeiou]/i.test(word) ? `an ${word}` : `a ${word}`;
-}
-
-export function InvitationEmail({
-  organizationName,
-  inviterName,
-  role,
-  acceptUrl,
-  expiresOn,
-}: InvitationEmailProps) {
-  return (
-    <EmailLayout
-      preview={`${inviterName} invited you to ${organizationName}`}
-      footer={`The invitation expires on ${expiresOn}. If you did not expect it, ignore this email.`}
-    >
-      <EmailLabel>Invitation</EmailLabel>
-      <EmailHeading>Join {organizationName} on LocusGraph</EmailHeading>
-      <EmailText>
-        {inviterName} invited you to {organizationName} as {withIndefiniteArticle(role)}. Sign in
-        with Google or GitHub to accept.
-      </EmailText>
-      <EmailButton href={acceptUrl}>Accept invitation</EmailButton>
-    </EmailLayout>
-  );
-}
-
-export function invitationEmail(props: InvitationEmailProps) {
-  return renderEmail(
-    `Join ${props.organizationName} on LocusGraph`,
-    <InvitationEmail {...props} />
-  );
-}
diff --git a/packages/email/src/templates/keys/key-created.tsx b/packages/email/src/templates/keys/key-created.tsx
new file mode 100644
index 00000000..2b659271
--- /dev/null
+++ b/packages/email/src/templates/keys/key-created.tsx
@@ -0,0 +1,32 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+import { securityFooter } from "../../kit/text/security";
+
+export type KeyCreatedEmailData = {
+  organizationName: string;
+  keyName: string;
+  createdBy: string;
+  createdOn: string;
+  keysUrl: string;
+};
+
+export type KeyCreatedEmailProps = WithOverrides<KeyCreatedEmailData>;
+
+export const { Component: KeyCreatedEmail, render: keyCreatedEmail } =
+  defineEmail<KeyCreatedEmailData>({
+    text: {
+      subject: (p) => `New API key ${p.keyName} on ${p.organizationName}`,
+      preview: "If you do not recognize this key, revoke it",
+      label: "API keys",
+      heading: "New API key created",
+      body: (p) => `${p.createdBy} created an API key for ${p.organizationName}.`,
+      button: "Review keys",
+      footer: securityFooter,
+    },
+    actionUrl: (p) => p.keysUrl,
+    rows: (p) => [
+      ["Key", p.keyName],
+      ["Created by", p.createdBy],
+      ["Date", p.createdOn],
+    ],
+  });
diff --git a/packages/email/src/templates/keys/key-expiring.tsx b/packages/email/src/templates/keys/key-expiring.tsx
new file mode 100644
index 00000000..2f142caa
--- /dev/null
+++ b/packages/email/src/templates/keys/key-expiring.tsx
@@ -0,0 +1,29 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+
+export type KeyExpiringEmailData = {
+  organizationName: string;
+  keyName: string;
+  expiresOn: string;
+  keysUrl: string;
+};
+
+export type KeyExpiringEmailProps = WithOverrides<KeyExpiringEmailData>;
+
+export const { Component: KeyExpiringEmail, render: keyExpiringEmail } =
+  defineEmail<KeyExpiringEmailData>({
+    text: {
+      subject: (p) => `API key ${p.keyName} expires on ${p.expiresOn}`,
+      preview: "Create a new key and switch to it before then",
+      label: "API keys",
+      heading: (p) => `API key expires on ${p.expiresOn}`,
+      body: (p) =>
+        `After that date, anything using this key for ${p.organizationName} gets refused. Create a new key and switch to it before then.`,
+      button: "Create a new key",
+    },
+    actionUrl: (p) => p.keysUrl,
+    rows: (p) => [
+      ["Key", p.keyName],
+      ["Expires", p.expiresOn],
+    ],
+  });
diff --git a/packages/email/src/templates/keys/key-revoked.tsx b/packages/email/src/templates/keys/key-revoked.tsx
new file mode 100644
index 00000000..e7cb9044
--- /dev/null
+++ b/packages/email/src/templates/keys/key-revoked.tsx
@@ -0,0 +1,33 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+import { securityFooter } from "../../kit/text/security";
+
+export type KeyRevokedEmailData = {
+  organizationName: string;
+  keyName: string;
+  revokedBy: string;
+  revokedOn: string;
+  keysUrl: string;
+};
+
+export type KeyRevokedEmailProps = WithOverrides<KeyRevokedEmailData>;
+
+export const { Component: KeyRevokedEmail, render: keyRevokedEmail } =
+  defineEmail<KeyRevokedEmailData>({
+    text: {
+      subject: (p) => `API key ${p.keyName} revoked on ${p.organizationName}`,
+      preview: "Anything still using it now gets refused",
+      label: "API keys",
+      heading: "API key revoked",
+      body: (p) =>
+        `${p.revokedBy} revoked an API key for ${p.organizationName}. Anything still using it now gets refused.`,
+      button: "Review keys",
+      footer: securityFooter,
+    },
+    actionUrl: (p) => p.keysUrl,
+    rows: (p) => [
+      ["Key", p.keyName],
+      ["Revoked by", p.revokedBy],
+      ["Date", p.revokedOn],
+    ],
+  });
diff --git a/packages/email/src/templates/low-credits.tsx b/packages/email/src/templates/low-credits.tsx
deleted file mode 100644
index 4deb3dee..00000000
--- a/packages/email/src/templates/low-credits.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { formatMicroUsd } from "@locusgraph/utils";
-import { EmailLayout } from "../kit/email-layout";
-import { EmailButton, EmailHeading, EmailLabel, EmailText } from "../kit/parts";
-import { renderEmail } from "../render";
-
-export type LowCreditsEmailProps = {
-  organizationName: string;
-  balanceMicroUsd: number;
-  buyCreditsUrl: string;
-};
-
-export function LowCreditsEmail({
-  organizationName,
-  balanceMicroUsd,
-  buyCreditsUrl,
-}: LowCreditsEmailProps) {
-  const empty = balanceMicroUsd <= 0;
-  return (
-    <EmailLayout
-      preview={
-        empty ? `${organizationName} is out of credits` : `${organizationName} is low on credits`
-      }
-    >
-      <EmailLabel>Credits</EmailLabel>
-      <EmailHeading>
-        {empty ? "Out of credits" : `${formatMicroUsd(balanceMicroUsd)} of credits left`}
-      </EmailHeading>
-      <EmailText>
-        {empty
-          ? `Paid usage for ${organizationName} is paused until you add credits.`
-          : `Add credits so paid usage for ${organizationName} does not stop.`}
-      </EmailText>
-      <EmailButton href={buyCreditsUrl}>Buy credits</EmailButton>
-    </EmailLayout>
-  );
-}
-
-export function lowCreditsEmail(props: LowCreditsEmailProps) {
-  const subject =
-    props.balanceMicroUsd <= 0 ? "You are out of credits" : "Your credits are running low";
-  return renderEmail(`${subject} on ${props.organizationName}`, <LowCreditsEmail {...props} />);
-}
diff --git a/packages/email/src/templates/members/member-removed.tsx b/packages/email/src/templates/members/member-removed.tsx
new file mode 100644
index 00000000..8fc19614
--- /dev/null
+++ b/packages/email/src/templates/members/member-removed.tsx
@@ -0,0 +1,23 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+
+export type MemberRemovedEmailData = {
+  organizationName: string;
+  removedBy: string;
+};
+
+export type MemberRemovedEmailProps = WithOverrides<MemberRemovedEmailData>;
+
+export const { Component: MemberRemovedEmail, render: memberRemovedEmail } =
+  defineEmail<MemberRemovedEmailData>({
+    text: {
+      subject: (p) => `You were removed from ${p.organizationName}`,
+      preview: "You no longer have access to its data or keys",
+      label: "Members",
+      heading: (p) => `You were removed from ${p.organizationName}`,
+      body: (p) =>
+        `${p.removedBy} removed you from ${p.organizationName}. You no longer have access to its data or keys.`,
+      footer: (p) =>
+        `If you think this is a mistake, ask an owner of ${p.organizationName} to invite you again.`,
+    },
+  });
diff --git a/packages/email/src/templates/members/role-changed.tsx b/packages/email/src/templates/members/role-changed.tsx
new file mode 100644
index 00000000..c8a8b35e
--- /dev/null
+++ b/packages/email/src/templates/members/role-changed.tsx
@@ -0,0 +1,28 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+import { securityFooter } from "../../kit/text/security";
+import { withIndefiniteArticle } from "../../kit/words";
+
+export type RoleChangedEmailData = {
+  organizationName: string;
+  role: string;
+  changedBy: string;
+  organizationUrl: string;
+};
+
+export type RoleChangedEmailProps = WithOverrides<RoleChangedEmailData>;
+
+export const { Component: RoleChangedEmail, render: roleChangedEmail } =
+  defineEmail<RoleChangedEmailData>({
+    text: {
+      subject: (p) => `You are now ${withIndefiniteArticle(p.role)} of ${p.organizationName}`,
+      preview: (p) => `${p.changedBy} changed your role`,
+      label: "Members",
+      heading: "Your role changed",
+      body: (p) =>
+        `${p.changedBy} made you ${withIndefiniteArticle(p.role)} of ${p.organizationName}.`,
+      button: "Open organization",
+      footer: securityFooter,
+    },
+    actionUrl: (p) => p.organizationUrl,
+  });
diff --git a/packages/email/src/templates/org/invitation-accepted.tsx b/packages/email/src/templates/org/invitation-accepted.tsx
new file mode 100644
index 00000000..e2dffc32
--- /dev/null
+++ b/packages/email/src/templates/org/invitation-accepted.tsx
@@ -0,0 +1,26 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+import { withIndefiniteArticle } from "../../kit/words";
+
+export type InvitationAcceptedEmailData = {
+  organizationName: string;
+  memberName: string;
+  role: string;
+  membersUrl: string;
+};
+
+export type InvitationAcceptedEmailProps = WithOverrides<InvitationAcceptedEmailData>;
+
+export const { Component: InvitationAcceptedEmail, render: invitationAcceptedEmail } =
+  defineEmail<InvitationAcceptedEmailData>({
+    text: {
+      subject: (p) => `${p.memberName} joined ${p.organizationName}`,
+      preview: (p) => `${p.memberName} accepted your invitation`,
+      label: "Members",
+      heading: (p) => `${p.memberName} joined`,
+      body: (p) =>
+        `${p.memberName} accepted your invitation and joined ${p.organizationName} as ${withIndefiniteArticle(p.role)}.`,
+      button: "See members",
+    },
+    actionUrl: (p) => p.membersUrl,
+  });
diff --git a/packages/email/src/templates/org/invitation.tsx b/packages/email/src/templates/org/invitation.tsx
new file mode 100644
index 00000000..70a2115f
--- /dev/null
+++ b/packages/email/src/templates/org/invitation.tsx
@@ -0,0 +1,29 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+import { withIndefiniteArticle } from "../../kit/words";
+
+export type InvitationEmailData = {
+  organizationName: string;
+  inviterName: string;
+  role: string;
+  acceptUrl: string;
+  expiresOn: string;
+};
+
+export type InvitationEmailProps = WithOverrides<InvitationEmailData>;
+
+export const { Component: InvitationEmail, render: invitationEmail } =
+  defineEmail<InvitationEmailData>({
+    text: {
+      subject: (p) => `Join ${p.organizationName} on ${p.brandName}`,
+      preview: (p) => `${p.inviterName} invited you as ${withIndefiniteArticle(p.role)}`,
+      label: "Invitation",
+      heading: (p) => `Join ${p.organizationName} on ${p.brandName}`,
+      body: (p) =>
+        `${p.inviterName} invited you to ${p.organizationName} as ${withIndefiniteArticle(p.role)}. Sign in with Google or GitHub to accept.`,
+      button: "Accept invitation",
+      footer: (p) =>
+        `The invitation expires on ${p.expiresOn}. If you did not expect it, ignore this email.`,
+    },
+    actionUrl: (p) => p.acceptUrl,
+  });
diff --git a/packages/email/src/templates/org/organization-deleted.tsx b/packages/email/src/templates/org/organization-deleted.tsx
new file mode 100644
index 00000000..623a4b01
--- /dev/null
+++ b/packages/email/src/templates/org/organization-deleted.tsx
@@ -0,0 +1,28 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+import { securityFooter } from "../../kit/text/security";
+
+export type OrganizationDeletedEmailData = {
+  organizationName: string;
+  deletedBy: string;
+  deletedOn: string;
+};
+
+export type OrganizationDeletedEmailProps = WithOverrides<OrganizationDeletedEmailData>;
+
+export const { Component: OrganizationDeletedEmail, render: organizationDeletedEmail } =
+  defineEmail<OrganizationDeletedEmailData>({
+    text: {
+      subject: (p) => `${p.organizationName} was deleted`,
+      preview: "Its members, keys and data are gone",
+      label: "Organization",
+      heading: (p) => `${p.organizationName} was deleted`,
+      body: (p) =>
+        `${p.deletedBy} deleted ${p.organizationName}. Its members, keys and data are gone, and you no longer have access.`,
+      footer: securityFooter,
+    },
+    rows: (p) => [
+      ["Deleted by", p.deletedBy],
+      ["Date", p.deletedOn],
+    ],
+  });
diff --git a/packages/email/src/templates/org/ownership-transferred.tsx b/packages/email/src/templates/org/ownership-transferred.tsx
new file mode 100644
index 00000000..dcabce17
--- /dev/null
+++ b/packages/email/src/templates/org/ownership-transferred.tsx
@@ -0,0 +1,33 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+import { securityFooter } from "../../kit/text/security";
+
+export type OwnershipTransferredEmailData = {
+  organizationName: string;
+  previousOwnerName: string;
+  newOwnerName: string;
+  transferredOn: string;
+  organizationUrl: string;
+};
+
+export type OwnershipTransferredEmailProps = WithOverrides<OwnershipTransferredEmailData>;
+
+export const { Component: OwnershipTransferredEmail, render: ownershipTransferredEmail } =
+  defineEmail<OwnershipTransferredEmailData>({
+    text: {
+      subject: (p) => `${p.newOwnerName} now owns ${p.organizationName}`,
+      preview: (p) => `${p.previousOwnerName} transferred ownership on ${p.transferredOn}`,
+      label: "Organization",
+      heading: (p) => `${p.organizationName} has a new owner`,
+      body: (p) =>
+        `${p.previousOwnerName} transferred ownership of ${p.organizationName} to ${p.newOwnerName}.`,
+      button: "Open organization",
+      footer: securityFooter,
+    },
+    actionUrl: (p) => p.organizationUrl,
+    rows: (p) => [
+      ["Previous owner", p.previousOwnerName],
+      ["New owner", p.newOwnerName],
+      ["Date", p.transferredOn],
+    ],
+  });
diff --git a/packages/email/src/templates/receipt.tsx b/packages/email/src/templates/receipt.tsx
deleted file mode 100644
index 9ade765f..00000000
--- a/packages/email/src/templates/receipt.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { formatCents } from "@locusgraph/utils";
-import { EmailLayout } from "../kit/email-layout";
-import { EmailButton, EmailHeading, EmailLabel, EmailRows, EmailText } from "../kit/parts";
-import { renderEmail } from "../render";
-
-export type ReceiptEmailProps = {
-  organizationName: string;
-  description: string;
-  amountCents: number;
-  paidOn: string;
-  receiptUrl: string;
-};
-
-export function ReceiptEmail({
-  organizationName,
-  description,
-  amountCents,
-  paidOn,
-  receiptUrl,
-}: ReceiptEmailProps) {
-  return (
-    <EmailLayout
-      preview={`${formatCents(amountCents)} paid for ${organizationName}`}
-      footer="Stripe processed this payment. The receipt link shows the full invoice."
-    >
-      <EmailLabel>Receipt</EmailLabel>
-      <EmailHeading>{formatCents(amountCents)} paid</EmailHeading>
-      <EmailText>Thanks. Here is what {organizationName} paid for.</EmailText>
-      <EmailRows
-        rows={[
-          ["Item", description],
-          ["Date", paidOn],
-          ["Total", formatCents(amountCents)],
-        ]}
-      />
-      <EmailButton href={receiptUrl}>View receipt</EmailButton>
-    </EmailLayout>
-  );
-}
-
-export function receiptEmail(props: ReceiptEmailProps) {
-  return renderEmail(
-    `Receipt: ${formatCents(props.amountCents)} for ${props.organizationName}`,
-    <ReceiptEmail {...props} />
-  );
-}
diff --git a/packages/email/src/templates/usage-over-plan.tsx b/packages/email/src/templates/usage-over-plan.tsx
deleted file mode 100644
index 0ad0bbb8..00000000
--- a/packages/email/src/templates/usage-over-plan.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { formatCount } from "@locusgraph/utils";
-import { EmailLayout } from "../kit/email-layout";
-import { EmailButton, EmailHeading, EmailLabel, EmailRows, EmailText } from "../kit/parts";
-import { renderEmail } from "../render";
-
-export type OverQuota = {
-  key: string;
-  label?: string;
-  used: number;
-  included: number;
-  periodLabel: string;
-};
-
-export type UsageOverPlanEmailProps = {
-  organizationName: string;
-  quotas: OverQuota[];
-  usageUrl: string;
-};
-
-export function UsageOverPlanEmail({
-  organizationName,
-  quotas,
-  usageUrl,
-}: UsageOverPlanEmailProps) {
-  return (
-    <EmailLayout preview={`${organizationName} is over its plan`}>
-      <EmailLabel>Usage</EmailLabel>
-      <EmailHeading>Usage is over your plan</EmailHeading>
-      <EmailText>
-        {organizationName} used more than its plan includes. Usage past the plan comes from prepaid
-        credits, or stops when overage is off.
-      </EmailText>
-      <EmailRows
-        rows={quotas.map((quota) => [
-          quota.label ?? quota.key,
-          `${formatCount(quota.used)} of ${formatCount(quota.included)} ${quota.periodLabel}`,
-        ])}
-      />
-      <EmailButton href={usageUrl}>See usage</EmailButton>
-    </EmailLayout>
-  );
-}
-
-export function usageOverPlanEmail(props: UsageOverPlanEmailProps) {
-  return renderEmail(
-    `${props.organizationName} is over its plan`,
-    <UsageOverPlanEmail {...props} />
-  );
-}
diff --git a/packages/email/src/templates/usage/quota-rows.ts b/packages/email/src/templates/usage/quota-rows.ts
new file mode 100644
index 00000000..c8c6eacd
--- /dev/null
+++ b/packages/email/src/templates/usage/quota-rows.ts
@@ -0,0 +1,16 @@
+import { formatCount } from "@locusgraph/utils";
+
+export type OverQuota = {
+  key: string;
+  label?: string;
+  used: number;
+  included: number;
+  periodLabel: string;
+};
+
+export function quotaRows(quotas: OverQuota[]): [string, string][] {
+  return quotas.map((quota) => [
+    quota.label ?? quota.key,
+    `${formatCount(quota.used)} of ${formatCount(quota.included)} ${quota.periodLabel}`,
+  ]);
+}
diff --git a/packages/email/src/templates/usage/spend-limit-reached.tsx b/packages/email/src/templates/usage/spend-limit-reached.tsx
new file mode 100644
index 00000000..34183387
--- /dev/null
+++ b/packages/email/src/templates/usage/spend-limit-reached.tsx
@@ -0,0 +1,32 @@
+import { formatCents } from "@locusgraph/utils";
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+
+export type SpendLimitReachedEmailData = {
+  organizationName: string;
+  limitCents: number;
+  reachedOn: string;
+  resetsOn: string;
+  limitsUrl: string;
+};
+
+export type SpendLimitReachedEmailProps = WithOverrides<SpendLimitReachedEmailData>;
+
+export const { Component: SpendLimitReachedEmail, render: spendLimitReachedEmail } =
+  defineEmail<SpendLimitReachedEmailData>({
+    text: {
+      subject: (p) => `${p.organizationName} reached its spend limit`,
+      preview: "API requests are paused until you raise the limit",
+      label: "Usage",
+      heading: "Spend limit reached",
+      body: (p) =>
+        `${p.organizationName} reached its spend limit of ${formatCents(p.limitCents)}. API requests are paused until you raise the limit or the limit resets.`,
+      button: "Raise limit",
+    },
+    actionUrl: (p) => p.limitsUrl,
+    rows: (p) => [
+      ["Limit", formatCents(p.limitCents)],
+      ["Reached", p.reachedOn],
+      ["Resets", p.resetsOn],
+    ],
+  });
diff --git a/packages/email/src/templates/usage/usage-over-plan.tsx b/packages/email/src/templates/usage/usage-over-plan.tsx
new file mode 100644
index 00000000..a353f4dc
--- /dev/null
+++ b/packages/email/src/templates/usage/usage-over-plan.tsx
@@ -0,0 +1,28 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+import { type OverQuota, quotaRows } from "./quota-rows";
+
+export type { OverQuota };
+
+export type UsageOverPlanEmailData = {
+  organizationName: string;
+  quotas: OverQuota[];
+  usageUrl: string;
+};
+
+export type UsageOverPlanEmailProps = WithOverrides<UsageOverPlanEmailData>;
+
+export const { Component: UsageOverPlanEmail, render: usageOverPlanEmail } =
+  defineEmail<UsageOverPlanEmailData>({
+    text: {
+      subject: (p) => `${p.organizationName} is over its plan`,
+      preview: "Usage past the plan draws on credits or stops",
+      label: "Usage",
+      heading: "Usage is over your plan",
+      body: (p) =>
+        `${p.organizationName} used more than its plan includes. Usage past the plan draws on credits, or stops when overage is off.`,
+      button: "See usage",
+    },
+    actionUrl: (p) => p.usageUrl,
+    rows: (p) => quotaRows(p.quotas),
+  });
diff --git a/packages/email/src/templates/usage/usage-summary.tsx b/packages/email/src/templates/usage/usage-summary.tsx
new file mode 100644
index 00000000..29046480
--- /dev/null
+++ b/packages/email/src/templates/usage/usage-summary.tsx
@@ -0,0 +1,26 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+
+export type UsageSummaryEmailData = {
+  organizationName: string;
+  periodLabel: string;
+  rows: [label: string, value: string][];
+  usageUrl: string;
+};
+
+export type UsageSummaryEmailProps = WithOverrides<UsageSummaryEmailData>;
+
+export const { Component: UsageSummaryEmail, render: usageSummaryEmail } =
+  defineEmail<UsageSummaryEmailData>({
+    text: {
+      subject: (p) => `${p.organizationName} usage for ${p.periodLabel}`,
+      preview: (p) => `A summary of what ${p.organizationName} used`,
+      label: "Monthly summary",
+      heading: (p) => `Your ${p.periodLabel} usage`,
+      body: (p) => `Here is what ${p.organizationName} used in ${p.periodLabel}.`,
+      button: "See usage",
+      footer: "You get this summary once a month as an owner or admin.",
+    },
+    actionUrl: (p) => p.usageUrl,
+    rows: (p) => p.rows,
+  });
diff --git a/packages/email/src/templates/usage/usage-warning.tsx b/packages/email/src/templates/usage/usage-warning.tsx
new file mode 100644
index 00000000..af0a63d3
--- /dev/null
+++ b/packages/email/src/templates/usage/usage-warning.tsx
@@ -0,0 +1,27 @@
+import { defineEmail } from "../../kit/text/define-email";
+import type { WithOverrides } from "../../kit/text/overrides";
+import { type OverQuota, quotaRows } from "./quota-rows";
+
+export type UsageWarningEmailData = {
+  organizationName: string;
+  percentUsed: number;
+  quotas: OverQuota[];
+  usageUrl: string;
+};
+
+export type UsageWarningEmailProps = WithOverrides<UsageWarningEmailData>;
+
+export const { Component: UsageWarningEmail, render: usageWarningEmail } =
+  defineEmail<UsageWarningEmailData>({
+    text: {
+      subject: (p) => `${p.organizationName} used ${p.percentUsed}% of its plan`,
+      preview: "Upgrade or add credits so nothing stops",
+      label: "Usage",
+      heading: (p) => `${p.percentUsed}% of your plan used`,
+      body: (p) =>
+        `${p.organizationName} is close to what its plan includes. Upgrade or add credits so nothing stops.`,
+      button: "See usage",
+    },
+    actionUrl: (p) => p.usageUrl,
+    rows: (p) => quotaRows(p.quotas),
+  });
diff --git a/packages/email/src/tests/account.test.tsx b/packages/email/src/tests/account.test.tsx
new file mode 100644
index 00000000..5a30ced1
--- /dev/null
+++ b/packages/email/src/tests/account.test.tsx
@@ -0,0 +1,40 @@
+import { describe, expect, it } from "vitest";
+import { welcomeEmail } from "../index";
+
+describe("account emails", () => {
+  it("welcomes a new user by name and links to the dashboard", () => {
+    const welcome = welcomeEmail({
+      userName: "Dana",
+      dashboardUrl: "https://d",
+      docsUrl: "https://docs",
+    });
+    expect(welcome.subject).toBe("Welcome to LocusGraph");
+    expect(welcome.text).toContain("Welcome, Dana");
+    expect(welcome.text).toContain("Open dashboard: https://d");
+    expect(welcome.text).toContain("Read the docs for a quick start and guides: https://docs");
+  });
+
+  it("names the product a SpendGraph user signed up for", () => {
+    const welcome = welcomeEmail({
+      product: "spendgraph",
+      userName: "Dana",
+      dashboardUrl: "https://d",
+      docsUrl: "https://docs",
+    });
+    expect(welcome.subject).toBe("Welcome to SpendGraph");
+    expect(welcome.text).toContain("Your SpendGraph account is ready.");
+  });
+
+  it("replaces the body when the app passes an override", () => {
+    const welcome = welcomeEmail({
+      product: "spendgraph",
+      userName: "Dana",
+      dashboardUrl: "https://d",
+      docsUrl: "https://docs",
+      overrides: { body: "Connect your first agent to start tracking spend." },
+    });
+    expect(welcome.text).toContain("Connect your first agent to start tracking spend.");
+    expect(welcome.text).not.toContain("API key");
+    expect(welcome.text).toContain("Open dashboard: https://d");
+  });
+});
diff --git a/packages/email/src/tests/brand/brand.test.tsx b/packages/email/src/tests/brand/brand.test.tsx
new file mode 100644
index 00000000..fd7ba900
--- /dev/null
+++ b/packages/email/src/tests/brand/brand.test.tsx
@@ -0,0 +1,66 @@
+import { describe, expect, it } from "vitest";
+import { emailAssetsOrigin, invitationEmail, lowCreditsEmail } from "../../index";
+
+const invitation = {
+  organizationName: "Acme",
+  inviterName: "Dana",
+  role: "member",
+  acceptUrl: "https://accounts.locusgraph.com/",
+  expiresOn: "Oct 24, 2026",
+};
+
+describe("email brand", () => {
+  it("shows the LocusGraph mark and wordmark by default", () => {
+    const { html, text } = invitationEmail(invitation);
+    expect(html).toContain(`src="${emailAssetsOrigin}/email/locusgraph-mark.png"`);
+    expect(html).toContain("<strong>locus</strong>");
+    expect(text.endsWith("—\nLocusGraph")).toBe(true);
+  });
+
+  it("brands a SpendGraph email with its own mark, wordmark and name", () => {
+    const email = invitationEmail({ ...invitation, product: "spendgraph" });
+    expect(email.subject).toBe("Join Acme on SpendGraph");
+    expect(email.html).toContain(`src="${emailAssetsOrigin}/email/spendgraph-mark.png"`);
+    expect(email.html).toContain("<strong>spend</strong>");
+    expect(email.html).not.toContain("LocusGraph");
+  });
+
+  it("keeps the mark decorative so the wordmark is what screen readers and blocked images show", () => {
+    const { html } = lowCreditsEmail({
+      organizationName: "Acme",
+      balanceMicroUsd: 0,
+      buyCreditsUrl: "https://b",
+      product: "spendgraph",
+    });
+    expect(html).toContain('alt=""');
+    expect(html).toContain('<span style="font-weight:300">graph</span>');
+  });
+
+  it("swaps the logo, name and wordmark when a brand override is passed", () => {
+    const email = invitationEmail({
+      ...invitation,
+      brand: {
+        markUrl: "https://cdn.acme.com/logo.png",
+        markWidth: 32,
+        markHeight: 32,
+        name: "Acme Cloud",
+        wordmark: ["acme", "cloud"],
+      },
+    });
+    expect(email.subject).toBe("Join Acme on Acme Cloud");
+    expect(email.html).toContain('src="https://cdn.acme.com/logo.png" width="32" height="32"');
+    expect(email.html).toContain("<strong>acme</strong>");
+    expect(email.html).not.toContain("locusgraph-mark.png");
+  });
+
+  it("keeps the product name and wordmark when only the logo is overridden", () => {
+    const email = invitationEmail({
+      ...invitation,
+      product: "spendgraph",
+      brand: { markUrl: "https://cdn.example.com/spend.png" },
+    });
+    expect(email.subject).toBe("Join Acme on SpendGraph");
+    expect(email.html).toContain('src="https://cdn.example.com/spend.png" width="27" height="24"');
+    expect(email.html).toContain("<strong>spend</strong>");
+  });
+});
diff --git a/packages/email/src/tests/brand/create-emails.test.tsx b/packages/email/src/tests/brand/create-emails.test.tsx
new file mode 100644
index 00000000..1e76b18e
--- /dev/null
+++ b/packages/email/src/tests/brand/create-emails.test.tsx
@@ -0,0 +1,45 @@
+import { describe, expect, it } from "vitest";
+import { createEmails, emailAssetsOrigin, emailTemplates } from "../../index";
+
+const emails = createEmails({
+  product: "spendgraph",
+  brand: { markUrl: "https://cdn.example.com/mark.png", markWidth: 32, markHeight: 32 },
+});
+
+const welcome = { userName: "Dana", dashboardUrl: "https://d", docsUrl: "https://docs" };
+
+describe("createEmails", () => {
+  it("binds every template under a short name", () => {
+    expect(Object.keys(emails).sort()).toEqual(Object.keys(emailTemplates).sort());
+  });
+
+  it("applies the product and brand set once to every email", () => {
+    const { subject, html } = emails.welcome(welcome);
+    expect(subject).toBe("Welcome to SpendGraph");
+    expect(html).toContain('src="https://cdn.example.com/mark.png" width="32" height="32"');
+    expect(html).toContain("<strong>spend</strong>");
+    const failed = emails.paymentFailed({
+      organizationName: "Acme",
+      amountCents: 4000,
+      failedOn: "Nov 1, 2026",
+      billingUrl: "https://b",
+    });
+    expect(failed.html).toContain("https://cdn.example.com/mark.png");
+  });
+
+  it("lets one call override the product or merge in its own brand fields", () => {
+    const { subject, html } = emails.welcome({
+      ...welcome,
+      product: "locusgraph",
+      brand: { name: "Acme Cloud" },
+    });
+    expect(subject).toBe("Welcome to Acme Cloud");
+    expect(html).toContain("https://cdn.example.com/mark.png");
+    expect(html).toContain("<strong>locus</strong>");
+  });
+
+  it("falls back to the LocusGraph brand with no defaults", () => {
+    const { html } = createEmails().welcome(welcome);
+    expect(html).toContain(`${emailAssetsOrigin}/email/locusgraph-mark.png`);
+  });
+});
diff --git a/packages/email/src/tests/lifecycle.test.tsx b/packages/email/src/tests/lifecycle.test.tsx
new file mode 100644
index 00000000..4305ad03
--- /dev/null
+++ b/packages/email/src/tests/lifecycle.test.tsx
@@ -0,0 +1,73 @@
+import { describe, expect, it } from "vitest";
+import {
+  approvalRequestedEmail,
+  emailVerificationEmail,
+  paymentFailedEmail,
+  planChangedEmail,
+  spendLimitReachedEmail,
+} from "../index";
+
+describe("lifecycle emails", () => {
+  it("puts the verification code in the subject and links to verify", () => {
+    const verification = emailVerificationEmail({
+      code: "482913",
+      verifyUrl: "https://v",
+      expiresInMinutes: 30,
+    });
+    expect(verification.subject).toBe("482913 is your LocusGraph verification code");
+    expect(verification.text).toContain("Verify email: https://v");
+    expect(verification.text).toContain("It expires in 30 minutes.");
+  });
+
+  it("asks for a new payment method and lists only the rows it has", () => {
+    const failed = paymentFailedEmail({
+      organizationName: "Acme",
+      amountCents: 4000,
+      failedOn: "Nov 1, 2026",
+      reason: "Card declined",
+      billingUrl: "https://b",
+    });
+    expect(failed.subject).toBe("Payment failed for Acme");
+    expect(failed.text).toContain("Reason: Card declined");
+    expect(failed.text).not.toContain("Next try");
+    expect(failed.text).toContain("Update payment: https://b");
+  });
+
+  it("shows the old and new plan", () => {
+    const changed = planChangedEmail({
+      organizationName: "Acme",
+      previousPlan: "Free",
+      newPlan: "Pro",
+      effectiveOn: "Nov 4, 2026",
+      changedBy: "Dana",
+      billingUrl: "https://b",
+    });
+    expect(changed.subject).toBe("Acme plan changed to Pro");
+    expect(changed.text).toContain("Previous plan: Free");
+  });
+
+  it("says requests are paused at the spend limit", () => {
+    const limit = spendLimitReachedEmail({
+      organizationName: "Acme",
+      limitCents: 10000,
+      reachedOn: "Nov 4, 2026",
+      resetsOn: "Dec 1, 2026",
+      limitsUrl: "https://l",
+    });
+    expect(limit.subject).toBe("Acme reached its spend limit");
+    expect(limit.text).toContain("spend limit of $100.00");
+  });
+
+  it("asks a person to review a paused agent action", () => {
+    const approval = approvalRequestedEmail({
+      organizationName: "Acme",
+      agentName: "Deploy bot",
+      action: "Delete graph prod-memory",
+      requestedOn: "Nov 4, 2026, 10:42",
+      reviewUrl: "https://r",
+    });
+    expect(approval.subject).toBe("Deploy bot is waiting for your approval");
+    expect(approval.text).toContain("Action: Delete graph prod-memory");
+    expect(approval.text).not.toContain("Expires");
+  });
+});
diff --git a/packages/email/src/tests/notices.test.tsx b/packages/email/src/tests/notices.test.tsx
new file mode 100644
index 00000000..c60b7126
--- /dev/null
+++ b/packages/email/src/tests/notices.test.tsx
@@ -0,0 +1,85 @@
+import { describe, expect, it } from "vitest";
+import {
+  invitationAcceptedEmail,
+  keyCreatedEmail,
+  keyExpiringEmail,
+  keyRevokedEmail,
+  memberRemovedEmail,
+  organizationDeletedEmail,
+  ownershipTransferredEmail,
+  roleChangedEmail,
+  usageSummaryEmail,
+  usageWarningEmail,
+} from "../index";
+
+const keys = { organizationName: "Acme", keyName: "ci-deploy", keysUrl: "https://k" };
+
+describe("notice emails", () => {
+  it("names the key, who acted and links to the keys page", () => {
+    const created = keyCreatedEmail({ ...keys, createdBy: "Dana", createdOn: "Nov 3, 2026" });
+    expect(created.subject).toBe("New API key ci-deploy on Acme");
+    expect(created.text).toContain("Review keys: https://k");
+    const revoked = keyRevokedEmail({ ...keys, revokedBy: "Dana", revokedOn: "Nov 3, 2026" });
+    expect(revoked.subject).toBe("API key ci-deploy revoked on Acme");
+    const expiring = keyExpiringEmail({ ...keys, expiresOn: "Nov 10, 2026" });
+    expect(expiring.subject).toBe("API key ci-deploy expires on Nov 10, 2026");
+    expect(expiring.text).toContain("Create a new key: https://k");
+  });
+
+  it("tells members about joins, removals, role changes, new owners and deletion", () => {
+    expect(
+      invitationAcceptedEmail({
+        organizationName: "Acme",
+        memberName: "Sam",
+        role: "admin",
+        membersUrl: "https://m",
+      }).text
+    ).toContain("joined Acme as an admin.");
+    expect(memberRemovedEmail({ organizationName: "Acme", removedBy: "Dana" }).subject).toBe(
+      "You were removed from Acme"
+    );
+    expect(
+      roleChangedEmail({
+        organizationName: "Acme",
+        role: "owner",
+        changedBy: "Dana",
+        organizationUrl: "https://o",
+      }).subject
+    ).toBe("You are now an owner of Acme");
+    expect(
+      ownershipTransferredEmail({
+        organizationName: "Acme",
+        previousOwnerName: "Dana",
+        newOwnerName: "Sam",
+        transferredOn: "Nov 3, 2026",
+        organizationUrl: "https://o",
+      }).subject
+    ).toBe("Sam now owns Acme");
+    const deleted = organizationDeletedEmail({
+      organizationName: "Acme",
+      deletedBy: "Dana",
+      deletedOn: "Nov 3, 2026",
+    });
+    expect(deleted.subject).toBe("Acme was deleted");
+    expect(deleted.html).not.toContain("<a ");
+  });
+
+  it("warns before the plan runs out and sums up a month", () => {
+    const warning = usageWarningEmail({
+      organizationName: "Acme",
+      percentUsed: 80,
+      usageUrl: "https://u",
+      quotas: [{ key: "events", used: 8000, included: 10000, periodLabel: "this month" }],
+    });
+    expect(warning.subject).toBe("Acme used 80% of its plan");
+    expect(warning.text).toContain("events: 8,000 of 10,000 this month");
+    const summary = usageSummaryEmail({
+      organizationName: "Acme",
+      periodLabel: "October 2026",
+      rows: [["Memory writes", "124,000"]],
+      usageUrl: "https://u",
+    });
+    expect(summary.subject).toBe("Acme usage for October 2026");
+    expect(summary.text).toContain("Memory writes: 124,000");
+  });
+});
diff --git a/packages/email/src/tests/templates.test.tsx b/packages/email/src/tests/templates.test.tsx
index 7923b1cf..c9dfaddd 100644
--- a/packages/email/src/tests/templates.test.tsx
+++ b/packages/email/src/tests/templates.test.tsx
@@ -60,7 +60,7 @@ describe("email templates", () => {
         { key: "spendgraph.events", used: 10450, included: 10000, periodLabel: "this month" },
       ],
     });
-    expect(email.text).toContain("spendgraph.events 10,450 of 10,000 this month");
+    expect(email.text).toContain("spendgraph.events: 10,450 of 10,000 this month");
   });
 
   it("names a quota by its label when one is given", () => {
@@ -77,7 +77,7 @@ describe("email templates", () => {
         },
       ],
     });
-    expect(email.text).toContain("Events 10,450 of 10,000 this month");
+    expect(email.text).toContain("Events: 10,450 of 10,000 this month");
     expect(email.text).not.toContain("spendgraph.events");
   });
 
diff --git a/packages/email/src/tests/text/overrides.test.tsx b/packages/email/src/tests/text/overrides.test.tsx
new file mode 100644
index 00000000..d21d2f65
--- /dev/null
+++ b/packages/email/src/tests/text/overrides.test.tsx
@@ -0,0 +1,59 @@
+import { describe, expect, it } from "vitest";
+import { createEmails, formatMicroUsd, lowCreditsEmail } from "../../index";
+
+const credits = {
+  organizationName: "Acme",
+  balanceMicroUsd: 2_400_000,
+  buyCreditsUrl: "https://b",
+};
+
+describe("text overrides", () => {
+  it("replaces only the slots it names and keeps the rest", () => {
+    const email = lowCreditsEmail({
+      ...credits,
+      overrides: { heading: "Budget running low", button: "Add budget" },
+    });
+    expect(email.html).toContain("Budget running low");
+    expect(email.text).toContain("Add budget: https://b");
+    expect(email.text).toContain("Add credits so paid usage for Acme does not stop.");
+  });
+
+  it("passes the props and brand name to a slot function", () => {
+    const email = lowCreditsEmail({
+      ...credits,
+      product: "spendgraph",
+      overrides: {
+        body: (p) =>
+          `${p.organizationName} has ${formatMicroUsd(p.balanceMicroUsd)} left on ${p.brandName}.`,
+      },
+    });
+    expect(email.text).toContain("Acme has $2.40 left on SpendGraph.");
+  });
+
+  it("removes a slot when the override is an empty string", () => {
+    const email = lowCreditsEmail({ ...credits, overrides: { button: "" } });
+    expect(email.html).not.toContain('href="https://b"');
+    expect(email.text).not.toContain("https://b");
+  });
+
+  it("sets overrides once per template in createEmails and lets one call win", () => {
+    const emails = createEmails({
+      product: "spendgraph",
+      overrides: { lowCredits: { heading: "Budget running low", button: "Add budget" } },
+    });
+    const fromDefaults = emails.lowCredits(credits);
+    expect(fromDefaults.html).toContain("Budget running low");
+    const fromCall = emails.lowCredits({ ...credits, overrides: { button: "Top up" } });
+    expect(fromCall.text).toContain("Top up: https://b");
+    expect(fromCall.html).toContain("Budget running low");
+    expect(
+      emails.receipt({
+        organizationName: "Acme",
+        description: "Pro",
+        amountCents: 100,
+        paidOn: "x",
+        receiptUrl: "https://r",
+      }).text
+    ).toContain("View receipt: https://r");
+  });
+});
diff --git a/packages/email/src/tests/text/structure.test.tsx b/packages/email/src/tests/text/structure.test.tsx
new file mode 100644
index 00000000..57467341
--- /dev/null
+++ b/packages/email/src/tests/text/structure.test.tsx
@@ -0,0 +1,61 @@
+import { describe, expect, it } from "vitest";
+import { keyCreatedEmail, paymentFailedEmail, renderEmail } from "../../index";
+import { EmailButton } from "../../kit/parts";
+
+const failed = {
+  organizationName: "Acme",
+  amountCents: 4000,
+  failedOn: "Nov 1, 2026",
+  billingUrl: "https://accounts.locusgraph.com/billing/",
+};
+
+describe("email structure", () => {
+  it("previews the next step instead of repeating the subject", () => {
+    const { subject, html } = paymentFailedEmail(failed);
+    expect(html).toContain("Update your payment method to keep your plan active");
+    expect(html).not.toContain(`display:none;max-height:0;overflow:hidden">${subject}`);
+  });
+
+  it("shows the raw link under the button for clients that hide it", () => {
+    const { html } = paymentFailedEmail(failed);
+    expect(html).toContain("Or open:");
+    expect(html).toContain(">accounts.locusgraph.com/billing</a>");
+  });
+
+  it("orders plain text as heading, body, action, facts, then the brand", () => {
+    const { text } = paymentFailedEmail(failed);
+    expect(text.startsWith("Payment failed\n\nWe could not charge $40.00 for Acme.")).toBe(true);
+    expect(text.indexOf("Update payment:")).toBeLessThan(text.indexOf("Amount: $40.00"));
+    expect(text.endsWith("—\nLocusGraph")).toBe(true);
+    expect(text).not.toContain("Or open");
+  });
+
+  it("adds a calm footer to security emails", () => {
+    const { text } = keyCreatedEmail({
+      organizationName: "Acme",
+      keyName: "ci",
+      createdBy: "Dana",
+      createdOn: "Nov 3, 2026",
+      keysUrl: "https://k",
+      product: "spendgraph",
+    });
+    expect(text).toContain(
+      "If you did not expect this, reply to this email to reach SpendGraph support."
+    );
+  });
+
+  it("shows a relative or mailto link as written instead of failing", () => {
+    const relative = renderEmail("Hi", <EmailButton href="/billing">Go</EmailButton>);
+    expect(relative.html).toContain(">/billing</a>");
+    const mailto = renderEmail(
+      "Hi",
+      <EmailButton href="mailto:billing@acme.com">Mail</EmailButton>
+    );
+    expect(mailto.html).toContain(">billing@acme.com</a>");
+  });
+
+  it("keeps the raw link out of plain text for emails built with renderEmail", () => {
+    const { text } = renderEmail("Hi", <EmailButton href="https://x.com/a">Go</EmailButton>);
+    expect(text).toBe("Go: https://x.com/a");
+  });
+});