fix: remove content type restriction on attachments

fix: support external avatar URLs in generateAvatarUrl
fix: hide tooltip if content is empty
2026-02-04 22:37:18 +00:00 · 2026-02-04 22:20:23 +00:00 · 2026-02-04 21:57:50 +00:00 · 2026-02-04 21:53:04 +00:00 · 2026-02-04 21:50:37 +00:00 · 2026-02-04 20:49:20 +00:00
92 changed files with 29604 additions and 71472 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,62 +1,18 @@
-# Environment
 .env
-.env.*
-!.env.example

-# Docker
-docker-compose*.yml
+docker-compose.override.yml
+
+Dockerfile
+./**/*/Dockerfile
+
 .dockerignore

-# Dependencies (rebuilt in Docker)
 node_modules
-**/node_modules
+./**/*/node_modules

-# Build outputs (rebuilt in Docker)
-**/.next
-**/dist
-**/out
-**/.turbo
-**/.cache
-
-# Git
-.git
-.gitignore
-.gitattributes
-
-# IDE
-.vscode
-.idea
-*.swp
-*.swo
-
-# OS
-.DS_Store
-Thumbs.db
-
-# CI/CD
-.github
-.husky
-.changeset
-
-# Documentation (not needed in build)
-*.md
-!packages/db/migrations/**
-LICENSE
-CONTRIBUTING.md
-AGENTS.md
-CHANGELOG.md
-
-# Test files
-**/*.test.ts
-**/*.test.tsx
-**/*.spec.ts
-**/*.spec.tsx
-**/__tests__
-**/coverage
-
-# Logs
 pnpm-debug.log
-**/pnpm-debug.log
+./**/*/pnpm-debug.log

-# Cloud compose (separate deployment)
-cloud/
+README.md
+.next
+# .git
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -9,17 +9,11 @@ on:
  schedule:
    - cron: "21 21 * * *"
  push:
-    # Only trigger on tags (releases), not main branch pushes
-    # Main branch builds are handled by workflow_run after Translate completes
+    branches: ["main"]
+    # Publish semver tags as releases.
    tags: ["v*.*.*"]
  pull_request:
    branches: ["main"]
-  workflow_run:
-    workflows: ["Translate"]
-    types: [completed]
-    branches: [main]
-    # Docker builds after Translate completes (success or failure)
-    # This ensures Docker always has the latest translations

 env:
  # Use docker.io for Docker Hub if empty
@@ -29,9 +23,6 @@ env:

 jobs:
  build:
-    concurrency:
-      group: docker-build-${{ github.ref }}
-      cancel-in-progress: true
    runs-on: ubuntu-latest
    permissions:
      contents: read
--- a/.github/workflows/translate.yml
+++ b/.github/workflows/translate.yml
@@ -1,49 +0,0 @@
-name: Translate
-
-on:
-  push:
-    branches: [main]
-
-permissions:
-  contents: write
-
-jobs:
-  translate:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      
-      - name: Extract translations
-        working-directory: apps/web
-        run: npx --yes @lingui/cli extract
-      
-      - name: Lingo.dev
-        uses: lingodotdev/lingo.dev@main
-        with:
-          api-key: ${{ secrets.LINGODOTDEV_API_KEY }}
-          commit-message: "chore: update translations"
-          working-directory: apps/web
-          commit-author-name: "${{ github.actor }}"
-          commit-author-email: "${{ github.actor }}@users.noreply.github.com"
-          parallel: true
-      
-      - name: Compile translations
-        working-directory: apps/web
-        run: npx --yes @lingui/cli compile --typescript
-      
-      - name: Commit compiled translations
-        run: |
-          git config --local user.email "${{ github.actor }}@users.noreply.github.com"
-          git config --local user.name "${{ github.actor }}"
-          if ls apps/web/src/locales/*/messages.ts 1> /dev/null 2>&1; then
-            git add apps/web/src/locales/*/messages.ts
-            git diff --staged --quiet || (git commit -m "chore: compile translations" && git push)
-          fi
-
--- a/README.md
+++ b/README.md
@@ -47,17 +47,7 @@ See our [roadmap](https://kan.bn/kan/roadmap) for upcoming features.

 ## Self Hosting 🐳

-### One-click Deployments
-
-The easiest way to deploy Kan is through Railway. We've partnered with Railway to maintain an official template that supports the development of the project.
-
-<a href="https://railway.com/deploy/kan?referralCode=bZPsr2&utm_medium=integration&utm_source=template&utm_campaign=generic">
-  <img src="https://railway.app/button.svg" alt="Deploy on Railway" height="40" />
-</a>
-
-### Docker Compose
-
-Alternatively, you can self-host Kan with Docker Compose. This will set up everything for you including your postgres database.
+The easiest way to self-host Kan is with Docker Compose. This will set up everything for you including your postgres database.

 1. Create a new file called `docker-compose.yml` and paste the following configuration:

--- a/apps/web/Dockerfile
+++ b/apps/web/Dockerfile
@@ -1,23 +1,25 @@
-# syntax=docker/dockerfile:1.7
-
 ARG NODE_VERSION=20
-ARG DISTROLESS_NODE_IMAGE=gcr.io/distroless/nodejs${NODE_VERSION}-debian12
+ARG APP_DIRNAME=web
+ARG PROJECT=@kan/web

-# ============================================
-# Stage 1: Alpine base with pnpm and turbo
-# ============================================
+# 1. Alpine image
 FROM node:${NODE_VERSION}-alpine AS alpine
 RUN apk update && \
-    apk add --no-cache libc6-compat && \
-    rm -rf /var/cache/apk/* /tmp/* || true && \
-    corepack enable && \
-    npm install turbo@2.3.1 --global && \
-    pnpm config set store-dir ~/.pnpm-store
+    apk add --no-cache --virtual .build-deps libc6-compat python3 make g++ && \
+    rm -rf /var/cache/apk/* /tmp/* || true

-# ============================================
-# Stage 2: Prune the monorepo
-# ============================================
-FROM alpine AS pruner
+# Setup pnpm and turbo on the alpine base
+FROM alpine AS base
+RUN corepack enable
+# Replace <your-major-version> with the major version installed in your repository. For example:
+# RUN npm install turbo@2.1.3 --global
+RUN npm install turbo@2.3.1 --global
+
+RUN pnpm config set store-dir ~/.pnpm-store
+
+# 2. Prune projects
+FROM base AS pruner
+ARG PROJECT

 RUN apk add --no-cache git

@@ -33,89 +35,53 @@ RUN git fetch --tags --unshallow 2>/dev/null || git fetch --tags 2>/dev/null ||
    echo "unknown") && \
    echo "$AUTO_VERSION" > /app/AUTO_VERSION

-RUN turbo prune --scope=@kan/web --scope=@kan/db --docker
+RUN turbo prune --scope=${PROJECT} --scope=@kan/db --docker
+ 
+# 3. Build the project
+FROM base AS builder
+ARG PROJECT
+ARG APP_VERSION

-# ============================================
-# Stage 3: Install dependencies
-# ============================================
-FROM alpine AS deps
 WORKDIR /app

 COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
 COPY --from=pruner /app/out/pnpm-workspace.yaml ./pnpm-workspace.yaml
 COPY --from=pruner /app/out/json/ .
-
-ENV CI=true
-RUN --mount=type=cache,id=pnpm,target=~/.pnpm-store pnpm install --frozen-lockfile
-
-# ============================================
-# Stage 4: Build the web application
-# ============================================
-FROM alpine AS builder
-ARG APP_VERSION
-
-WORKDIR /app
-
-COPY --from=deps /app/ ./
-COPY --from=pruner /app/out/full/ .
 COPY --from=pruner /app/AUTO_VERSION /tmp/AUTO_VERSION

-# Force standalone output for production Docker image
-ENV NEXT_PUBLIC_USE_STANDALONE_OUTPUT=true
 ENV CI=true

+RUN --mount=type=cache,id=pnpm,target=~/.pnpm-store pnpm install --frozen-lockfile
+ 
+COPY --from=pruner /app/out/full/ .
+
+# Use provided APP_VERSION or auto-generated from pruner stage
 RUN VERSION="${APP_VERSION:-$(cat /tmp/AUTO_VERSION 2>/dev/null | tr -d '\n\r' || echo 'unknown')}" && \
-    NEXT_PUBLIC_APP_VERSION="$VERSION" pnpm build --filter=@kan/web
+    NEXT_PUBLIC_APP_VERSION="$VERSION" pnpm build --filter=${PROJECT}

-# ============================================
-# Stage 5: Migration image (run-once container)
-# ============================================
-FROM node:${NODE_VERSION}-alpine AS migrate
-WORKDIR /db
+# # Copy static files to standalone directory
+# RUN mkdir -p apps/web/.next/standalone/.next && \
+# mv apps/web/public apps/web/.next/standalone/ && \
+# mv apps/web/.next/static apps/web/.next/standalone/.next/

-COPY packages/db/drizzle.config.ts ./drizzle.config.ts
-COPY packages/db/migrations/ ./migrations/
+# 4. Final image - runner stage to run the application
+FROM base AS runner
+ARG APP_DIRNAME
+ 
+# Don't run production as root
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+USER nextjs

-RUN npm init -y && \
-    npm install drizzle-kit drizzle-orm pg --save-exact && \
-    # Strip unnecessary files from node_modules
-    find node_modules -type f \( \
-      -name '*.d.ts' -o \
-      -name '*.d.mts' -o \
-      -name '*.d.cts' -o \
-      -name '*.map' -o \
-      -name '*.md' -o \
-      -name '*.txt' -o \
-      -name 'LICENSE*' -o \
-      -name 'CHANGELOG*' -o \
-      -name 'README*' -o \
-      -name '.eslint*' -o \
-      -name '.prettier*' -o \
-      -name 'tsconfig*.json' \
-    \) -delete && \
-    find node_modules -type d -empty -delete && \
-    rm -rf /root/.npm /tmp/*
-
-CMD ["npx", "drizzle-kit", "migrate"]
-
-# ============================================
-# Stage 6: Production web image (distroless)
-# ============================================
-FROM ${DISTROLESS_NODE_IMAGE} AS web
 WORKDIR /app

 ENV NODE_ENV=production
-ENV PORT=3000
-ENV HOSTNAME=0.0.0.0

-# Copy the standalone Next.js server
-COPY --from=builder /app/apps/web/.next/standalone/ ./
-# Copy static assets and public files
-COPY --from=builder /app/apps/web/.next/static/ ./apps/web/.next/static/
-COPY --from=builder /app/apps/web/public/ ./apps/web/public/
+COPY --chown=nextjs:nodejs --from=builder /app/ ./
+WORKDIR /app/apps/${APP_DIRNAME}

-# Copy bootstrap script for runtime env var injection
-COPY apps/web/bootstrap.cjs ./bootstrap.cjs
+ARG PORT=3000
+ENV PORT=${PORT}
+EXPOSE ${PORT}

-EXPOSE 3000
-CMD ["bootstrap.cjs"]
+CMD ["sh", "-c", "if [ -n \"$POSTGRES_URL\" ]; then cd /app && pnpm db:migrate && cd /app/apps/web; fi && pnpm start"]
--- a/apps/web/bootstrap.cjs
+++ b/apps/web/bootstrap.cjs
@@ -1,44 +0,0 @@
-/**
- * Bootstrap script for the distroless production image.
- *
- * Distroless images have no shell, so this Node.js script handles two tasks
- * that would normally be done in an entrypoint.sh:
- *
- * 1. Regenerate `public/__ENV.js` with the current runtime NEXT_PUBLIC_*
- *    environment variables.  The file was originally created at build time by
- *    next-runtime-env's `configureRuntimeEnv()`, but in a Docker deployment the
- *    env vars are provided at *run* time via docker-compose / docker run.
- *
- * 2. Start the Next.js standalone server.
- */
-
-const { writeFileSync, existsSync, mkdirSync } = require("fs");
-const path = require("path");
-
-// ---------------------------------------------------------------------------
-// 1. Inject runtime NEXT_PUBLIC_* env vars into __ENV.js
-// ---------------------------------------------------------------------------
-
-const publicDir = path.join(__dirname, "apps", "web", "public");
-
-if (!existsSync(publicDir)) {
-  mkdirSync(publicDir, { recursive: true });
-}
-
-const envVars = {};
-for (const [key, value] of Object.entries(process.env)) {
-  if (key.startsWith("NEXT_PUBLIC_")) {
-    envVars[key] = value;
-  }
-}
-
-writeFileSync(
-  path.join(publicDir, "__ENV.js"),
-  `self.__ENV = ${JSON.stringify(envVars)};`,
-);
-
-// ---------------------------------------------------------------------------
-// 2. Start the Next.js standalone server
-// ---------------------------------------------------------------------------
-
-require("./apps/web/server.js");
--- a/apps/web/i18n.json
+++ b/apps/web/i18n.json
@@ -1,12 +1,12 @@
 {
-  "version": "1.10",
+  "version": 0,
  "locale": {
    "source": "en",
    "targets": ["fr", "de", "es", "it", "nl", "ru", "pl", "pt-BR"]
  },
  "buckets": {
-    "json": {
-      "include": ["src/locales/[locale]/messages.json"]
+    "po": {
+      "include": ["src/locales/[locale]/messages.po"]
    }
  },
  "$schema": "https://lingo.dev/schema/i18n.json"
--- a/apps/web/i18n.lock
+++ b/apps/web/i18n.lock
--- a/apps/web/lingui.config.ts
+++ b/apps/web/lingui.config.ts
@@ -1,9 +1,7 @@
-import { defineConfig } from "@lingui/cli";
-import { formatter } from "@lingui/format-json";
+import type { LinguiConfig } from "@lingui/conf";

-
-export default defineConfig({
-  locales: ["en", "fr", "de", "es", "it", "nl", "ru", "pl", "pt-BR"],
+const config: LinguiConfig = {
+  locales: ["en", "fr", "de", "es", "it", "nl", "ru", "pl","pt-BR"],
  sourceLocale: "en",
  catalogs: [
    {
@@ -12,5 +10,6 @@ export default defineConfig({
      exclude: ["**/node_modules/**"],
    },
  ],
-  format: formatter({ style: "lingui" }),
-});
+};
+
+export default config;
--- a/apps/web/next.config.js
+++ b/apps/web/next.config.js
@@ -16,18 +16,6 @@ const config = {
      : undefined,
  reactStrictMode: true,

-  /** Exclude build tools and dev-only packages from the standalone output */
-  outputFileTracingExcludes: {
-    "**/*": [
-      "@esbuild/**",
-      "esbuild/**",
-      "typescript/**",
-      "webpack/**",
-      "uglify-js/**",
-      "terser/**",
-    ],
-  },
-
  /** Enables hot reloading for local packages without a build step */
  transpilePackages: [
    "@kan/api",
@@ -47,13 +35,49 @@ const config = {
    remotePatterns: (() => {
      /** @type {Array<{protocol: "http" | "https", hostname: string}>} */
      const patterns = [
-        { protocol: "https", hostname: "**" },
+        {
+          protocol: "https",
+          hostname:
+            env("S3_FORCE_PATH_STYLE") === "true"
+              ? `${env("NEXT_PUBLIC_STORAGE_DOMAIN")}`
+              : `*.${env("NEXT_PUBLIC_STORAGE_DOMAIN")}`,
+        },
        {
          protocol: "http",
          hostname: "localhost",
        },
+        {
+          protocol: "https",
+          hostname: "*.googleusercontent.com",
+        },
+        {
+          protocol: 'https',
+          hostname: 'cdn.discordapp.com',
+        },
      ];

+      // Extract root domain from S3_ENDPOINT and add wildcard pattern
+      const s3Endpoint = env("S3_ENDPOINT");
+      if (s3Endpoint) {
+        try {
+          const url = new URL(s3Endpoint);
+          const hostname = url.hostname;
+          const protocol = url.protocol.replace(":", "");
+
+          // Extract root domain (last 2 parts: e.g. cloudflarestorage.com)
+          const parts = hostname.split(".");
+          if (parts.length >= 2) {
+            const rootDomain = parts.slice(-2).join(".");
+            patterns.push({
+              protocol: protocol === "http" ? "http" : "https",
+              hostname: `*.${rootDomain}`,
+            });
+          }
+        } catch {
+          // If S3_ENDPOINT is not a valid URL, ignore it
+        }
+      }
+
      return patterns;
    })(),
  },
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -20,7 +20,6 @@
  },
  "dependencies": {
    "@aws-sdk/client-s3": "^3.802.0",
-    "@aws-sdk/lib-storage": "^3.802.0",
    "@aws-sdk/s3-request-presigner": "^3.812.0",
    "@headlessui/react": "^2.2.0",
    "@hookform/resolvers": "^3.3.4",
@@ -39,7 +38,6 @@
    "@tiptap/extension-link": "^2.22.2",
    "@tiptap/extension-mention": "^3.0.9",
    "@tiptap/extension-placeholder": "^2.14.0",
-    "@tiptap/extension-typography": "^3.18.0",
    "@tiptap/pm": "^2.14.0",
    "@tiptap/react": "^2.14.0",
    "@tiptap/starter-kit": "^2.14.0",
@@ -79,7 +77,6 @@
    "@kan/tailwind-config": "workspace:*",
    "@kan/tsconfig": "workspace:*",
    "@lingui/cli": "^5.3.2",
-    "@lingui/format-json": "^5.9.1",
    "@lingui/loader": "^5.3.2",
    "@lingui/swc-plugin": "^5.5.2",
    "@svgr/webpack": "^8.1.0",
--- a/apps/web/src/components/AuthForm.tsx
+++ b/apps/web/src/components/AuthForm.tsx
@@ -361,8 +361,8 @@ export function Auth({ setIsMagicLinkSent, isSignUp }: AuthProps) {
          })}
        </div>
      )}
-      {!(isCredentialsEnabled || isMagicLinkAvailable) &&
-        socialProviders?.length === 0 && (
+      <form onSubmit={handleSubmit(onSubmit)}>
+        {!isCredentialsEnabled && socialProviders?.length === 0 && (
          <div className="flex w-full items-center gap-4">
            <div className="h-[1px] w-1/3 bg-light-600 dark:bg-dark-600" />
            <span className="text-center text-sm text-light-900 dark:text-dark-900">
@@ -371,62 +371,65 @@ export function Auth({ setIsMagicLinkSent, isSignUp }: AuthProps) {
            <div className="h-[1px] w-1/3 bg-light-600 dark:bg-dark-600" />
          </div>
        )}
-      {(isCredentialsEnabled || isMagicLinkAvailable) && (
-        <form onSubmit={handleSubmit(onSubmit)}>
-          {socialProviders?.length !== 0 && (
-            <div className="mb-[1.5rem] flex w-full items-center gap-4">
-              <div className="h-[1px] w-full bg-light-600 dark:bg-dark-600" />
-              <span className="text-sm text-light-900 dark:text-dark-900">
-                {t`or`}
-              </span>
-              <div className="h-[1px] w-full bg-light-600 dark:bg-dark-600" />
-            </div>
-          )}
-          <div className="space-y-2">
-            {isSignUp && isCredentialsEnabled && (
-              <div>
-                <Input
-                  {...register("name", { required: true })}
-                  placeholder={t`Enter your name`}
-                />
-                {errors.name && (
-                  <p className="mt-2 text-xs text-red-400">
-                    {t`Please enter a valid name`}
-                  </p>
-                )}
-              </div>
-            )}
+        {!isCredentialsEnabled && socialProviders?.length !== 0 && (
+          <div className="mb-[1.5rem] flex w-full items-center gap-4">
+            <div className="h-[1px] w-full bg-light-600 dark:bg-dark-600" />
+            <span className="text-sm text-light-900 dark:text-dark-900">
+              {t`or`}
+            </span>
+            <div className="h-[1px] w-full bg-light-600 dark:bg-dark-600" />
+          </div>
+        )}
+        <div className="space-y-2">
+          {isSignUp && isCredentialsEnabled && (
            <div>
              <Input
-                {...register("email", { required: true })}
-                placeholder={t`Enter your email address`}
+                {...register("name", { required: true })}
+                placeholder={t`Enter your name`}
              />
-              {errors.email && (
+              {errors.name && (
                <p className="mt-2 text-xs text-red-400">
-                  {t`Please enter a valid email address`}
+                  {t`Please enter a valid name`}
                </p>
              )}
            </div>
-
-            {isCredentialsEnabled && (
+          )}
+          {(isCredentialsEnabled || isMagicLinkAvailable) && (
+            <>
              <div>
                <Input
-                  type="password"
-                  {...register("password", { required: true })}
-                  placeholder={t`Enter your password`}
+                  {...register("email", { required: true })}
+                  placeholder={t`Enter your email address`}
                />
-                {errors.password && (
+                {errors.email && (
                  <p className="mt-2 text-xs text-red-400">
-                    {errors.password.message ??
-                      t`Please enter a valid password`}
+                    {t`Please enter a valid email address`}
                  </p>
                )}
              </div>
-            )}
-            {loginError && (
-              <p className="mt-2 text-xs text-red-400">{loginError}</p>
-            )}
-          </div>
+
+              {isCredentialsEnabled && (
+                <div>
+                  <Input
+                    type="password"
+                    {...register("password", { required: true })}
+                    placeholder={t`Enter your password`}
+                  />
+                  {errors.password && (
+                    <p className="mt-2 text-xs text-red-400">
+                      {errors.password.message ??
+                        t`Please enter a valid password`}
+                    </p>
+                  )}
+                </div>
+              )}
+            </>
+          )}
+          {loginError && (
+            <p className="mt-2 text-xs text-red-400">{loginError}</p>
+          )}
+        </div>
+        {(isCredentialsEnabled || isMagicLinkAvailable) && (
          <div className="mt-[1.5rem] flex items-center gap-4">
            <Button
              isLoading={isLoginWithEmailPending}
@@ -438,11 +441,8 @@ export function Auth({ setIsMagicLinkSent, isSignUp }: AuthProps) {
              {isMagicLinkMode ? t`magic link` : t`email`}
            </Button>
          </div>
-        </form>
-      )}
-      {!(isCredentialsEnabled || isMagicLinkAvailable) && loginError && (
-        <p className="mt-2 text-xs text-red-400">{loginError}</p>
-      )}
+        )}
+      </form>
    </div>
  );
 }
--- a/apps/web/src/components/Editor.tsx
+++ b/apps/web/src/components/Editor.tsx
@@ -17,7 +17,6 @@ import {
  ReactRenderer,
  useEditor,
 } from "@tiptap/react";
-import Typography from "@tiptap/extension-typography";
 import StarterKit from "@tiptap/starter-kit";
 import Suggestion from "@tiptap/suggestion";
 import {
@@ -387,54 +386,46 @@ export interface SlashNodeAttrs {
  label?: string | null;
 }

-const getCommandItems = (disableHeadings: boolean): SlashCommandItem[] => {
-  const headingCommands: SlashCommandItem[] = disableHeadings
-    ? []
-    : [
-        {
-          title: "Heading 1",
-          icon: <HiH1 />,
-          command: ({ editor }) =>
-            editor.chain().focus().setHeading({ level: 1 }).run(),
-        },
-        {
-          title: "Heading 2",
-          icon: <HiH2 />,
-          command: ({ editor }) =>
-            editor.chain().focus().setHeading({ level: 2 }).run(),
-        },
-        {
-          title: "Heading 3",
-          icon: <HiH3 />,
-          command: ({ editor }) =>
-            editor.chain().focus().setHeading({ level: 3 }).run(),
-        },
-      ];
-
-  return [
-    ...headingCommands,
-    {
-      title: "Bullet List",
-      icon: <HiOutlineListBullet />,
-      command: ({ editor }) => editor.chain().focus().toggleBulletList().run(),
-    },
-    {
-      title: "Ordered List",
-      icon: <HiOutlineNumberedList />,
-      command: ({ editor }) => editor.chain().focus().toggleOrderedList().run(),
-    },
-    {
-      title: "Blockquote",
-      icon: <HiOutlineChatBubbleLeftEllipsis />,
-      command: ({ editor }) => editor.chain().focus().toggleBlockquote().run(),
-    },
-    {
-      title: "Code Block",
-      icon: <HiOutlineCodeBracketSquare />,
-      command: ({ editor }) => editor.chain().focus().toggleCodeBlock().run(),
-    },
-  ];
-};
+const CommandItems: SlashCommandItem[] = [
+  {
+    title: "Heading 1",
+    icon: <HiH1 />,
+    command: ({ editor }) =>
+      editor.chain().focus().setHeading({ level: 1 }).run(),
+  },
+  {
+    title: "Heading 2",
+    icon: <HiH2 />,
+    command: ({ editor }) =>
+      editor.chain().focus().setHeading({ level: 2 }).run(),
+  },
+  {
+    title: "Heading 3",
+    icon: <HiH3 />,
+    command: ({ editor }) =>
+      editor.chain().focus().setHeading({ level: 3 }).run(),
+  },
+  {
+    title: "Bullet List",
+    icon: <HiOutlineListBullet />,
+    command: ({ editor }) => editor.chain().focus().toggleBulletList().run(),
+  },
+  {
+    title: "Ordered List",
+    icon: <HiOutlineNumberedList />,
+    command: ({ editor }) => editor.chain().focus().toggleOrderedList().run(),
+  },
+  {
+    title: "Blockquote",
+    icon: <HiOutlineChatBubbleLeftEllipsis />,
+    command: ({ editor }) => editor.chain().focus().toggleBlockquote().run(),
+  },
+  {
+    title: "Code Block",
+    icon: <HiOutlineCodeBracketSquare />,
+    command: ({ editor }) => editor.chain().focus().toggleCodeBlock().run(),
+  },
+];

 export default function Editor({
  content,
@@ -443,8 +434,6 @@ export default function Editor({
  readOnly = false,
  workspaceMembers,
  enableYouTubeEmbed = true,
-  placeholder,
-  disableHeadings = false,
 }: {
  content: string | null;
  onChange?: (value: string) => void;
@@ -452,23 +441,18 @@ export default function Editor({
  readOnly?: boolean;
  workspaceMembers: WorkspaceMember[];
  enableYouTubeEmbed?: boolean;
-  placeholder?: string;
-  disableHeadings?: boolean;
 }) {
  const containerRef = useRef<HTMLDivElement>(null);

  const editor = useEditor(
    {
      extensions: [
-        StarterKit.configure({
-          heading: disableHeadings ? false : undefined,
-        }),
+        StarterKit,
        Markdown,
        Placeholder.configure({
          placeholder: readOnly
            ? ""
-            : placeholder ??
-              t`Add description... (type '/' to open commands or '@' to mention)`,
+            : t`Add description... (type '/' to open commands or '@' to mention)`,
        }),
        Link.configure({
          openOnClick: true,
@@ -481,10 +465,10 @@ export default function Editor({
          autolink: true,
        }),
        SlashCommands.configure({
-          commandItems: getCommandItems(disableHeadings),
+          commandItems: CommandItems,
          suggestion: {
            items: ({ query }: { query: string }) =>
-              filterSlashCommandItems(getCommandItems(disableHeadings), query),
+              filterSlashCommandItems(CommandItems, query),
            startOfLine: true,
            char: "/",
          },
@@ -496,28 +480,20 @@ export default function Editor({
          suggestion: {
            char: "@",
            items: ({ query }: { query: string }) => {
-              const withEmail = workspaceMembers.filter((member) => member.email);
-              
-              const mapped = withEmail.map((member: WorkspaceMember) => ({
-                id: member.publicId,
-                label: member?.user?.name?.trim() || member.email || "",
-                image: member?.user?.image ?? null,
-              }));
-              
-              const all: MentionItem[] = mapped.filter(
-                (item) => item.label && item.label.length > 0,
+              const all: MentionItem[] = workspaceMembers.map(
+                (member: WorkspaceMember) => ({
+                  id: member.publicId,
+                  label: member?.user?.name ?? member.email,
+                  image: member?.user?.image ?? null,
+                }),
              );
-              
-              const q = query.toLowerCase().trim();
-              
-              if (q === "") {
-                return all;
-              }
-              
-              const filtered = all.filter((u) =>
-                u.label.toLowerCase().includes(q),
+              const q = query.toLowerCase();
+              return all.filter(
+                (u) =>
+                  u.label &&
+                  typeof u.label === "string" &&
+                  u.label.toLowerCase().includes(q),
              );
-              return filtered;
            },
            command: ({ editor, range, props }) => {
              const id = props.id ?? "";
@@ -538,17 +514,6 @@ export default function Editor({
            return `${options.suggestion.char}${node.attrs.label ?? node.attrs.id}`;
          },
        }),
-        Typography.configure({
-            openDoubleQuote: false,
-            closeDoubleQuote: false,
-            openSingleQuote: false,
-            closeSingleQuote: false,
-            oneHalf: false,
-            oneQuarter: false,
-            threeQuarters: false,
-            superscriptTwo: false,
-            superscriptThree: false,
-        }),
        ...(enableYouTubeEmbed ? [YouTubeNode] : []),
      ],
      content,
--- a/apps/web/src/components/NewWorkspaceForm.tsx
+++ b/apps/web/src/components/NewWorkspaceForm.tsx
@@ -33,7 +33,7 @@ const schema = z.object({
    .min(3, {
      message: t`URL must be at least 3 characters long`,
    })
-    .max(64, { message: t`URL cannot exceed 64 characters` })
+    .max(24, { message: t`URL cannot exceed 24 characters` })
    .regex(/^(?![-]+$)[a-zA-Z0-9-]+$/, {
      message: t`URL can only contain letters, numbers, and hyphens`,
    })
--- a/apps/web/src/locales/de/messages.json
+++ b/apps/web/src/locales/de/messages.json
--- a/apps/web/src/locales/de/messages.po
+++ b/apps/web/src/locales/de/messages.po
--- a/apps/web/src/locales/de/messages.ts
+++ b/apps/web/src/locales/de/messages.ts
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
--- a/apps/web/src/locales/en/messages.po
+++ b/apps/web/src/locales/en/messages.po
--- a/apps/web/src/locales/en/messages.ts
+++ b/apps/web/src/locales/en/messages.ts
--- a/apps/web/src/locales/es/messages.json
+++ b/apps/web/src/locales/es/messages.json
--- a/apps/web/src/locales/es/messages.po
+++ b/apps/web/src/locales/es/messages.po
--- a/apps/web/src/locales/es/messages.ts
+++ b/apps/web/src/locales/es/messages.ts
--- a/apps/web/src/locales/fr/messages.json
+++ b/apps/web/src/locales/fr/messages.json
--- a/apps/web/src/locales/fr/messages.po
+++ b/apps/web/src/locales/fr/messages.po
--- a/apps/web/src/locales/fr/messages.ts
+++ b/apps/web/src/locales/fr/messages.ts
--- a/apps/web/src/locales/it/messages.json
+++ b/apps/web/src/locales/it/messages.json
--- a/apps/web/src/locales/it/messages.po
+++ b/apps/web/src/locales/it/messages.po
--- a/apps/web/src/locales/it/messages.ts
+++ b/apps/web/src/locales/it/messages.ts
--- a/apps/web/src/locales/nl/messages.json
+++ b/apps/web/src/locales/nl/messages.json
--- a/apps/web/src/locales/nl/messages.po
+++ b/apps/web/src/locales/nl/messages.po
--- a/apps/web/src/locales/nl/messages.ts
+++ b/apps/web/src/locales/nl/messages.ts
--- a/apps/web/src/locales/pl/messages.json
+++ b/apps/web/src/locales/pl/messages.json
--- a/apps/web/src/locales/pl/messages.po
+++ b/apps/web/src/locales/pl/messages.po
--- a/apps/web/src/locales/pl/messages.ts
+++ b/apps/web/src/locales/pl/messages.ts
--- a/apps/web/src/locales/pt-BR/messages.json
+++ b/apps/web/src/locales/pt-BR/messages.json
--- a/apps/web/src/locales/pt-BR/messages.po
+++ b/apps/web/src/locales/pt-BR/messages.po
--- a/apps/web/src/locales/pt-BR/messages.ts
+++ b/apps/web/src/locales/pt-BR/messages.ts
--- a/apps/web/src/locales/ru/messages.json
+++ b/apps/web/src/locales/ru/messages.json
--- a/apps/web/src/locales/ru/messages.po
+++ b/apps/web/src/locales/ru/messages.po
--- a/apps/web/src/locales/ru/messages.ts
+++ b/apps/web/src/locales/ru/messages.ts
--- a/apps/web/src/pages/api/auth/[...all].ts
+++ b/apps/web/src/pages/api/auth/[...all].ts
@@ -13,23 +13,6 @@ const authHandler = toNodeHandler(auth.handler);
 export default withRateLimit(
  { points: 100, duration: 60 },
  async (req, res) => {
-    /**
-     * Better-auth behind proxies (Nginx/Cloudflare) can sometimes fail to parse the protocol
-     * if headers are incorrectly set or if there are multiple values in X-Forwarded-Proto.
-     * We sanitize these headers here to ensure better-auth gets a clean protocol and host.
-     */
-    const forwardedProto = req.headers["x-forwarded-proto"];
-    if (forwardedProto) {
-      const p = Array.isArray(forwardedProto) ? forwardedProto[0] : forwardedProto;
-      req.headers["x-forwarded-proto"] = p?.split(",")[0]?.trim();
-    }
-
-    const forwardedHost = req.headers["x-forwarded-host"];
-    if (forwardedHost) {
-      const h = Array.isArray(forwardedHost) ? forwardedHost[0] : forwardedHost;
-      req.headers["host"] = h?.split(",")[0]?.trim();
-    }
-
    return await authHandler(req, res);
  },
 );
--- a/apps/web/src/pages/api/stripe/create_checkout_session.ts
+++ b/apps/web/src/pages/api/stripe/create_checkout_session.ts
@@ -11,7 +11,7 @@ import { withRateLimit } from "@kan/api/utils/rateLimit";
 const workspaceSlugSchema = z
  .string()
  .min(3)
-  .max(64)
+  .max(24)
  .regex(/^(?![-]+$)[a-zA-Z0-9-]+$/);

 interface CheckoutSessionRequest {
--- a/apps/web/src/pages/api/upload/attachment.ts
+++ b/apps/web/src/pages/api/upload/attachment.ts
@@ -1,17 +1,17 @@
 import type { NextApiRequest, NextApiResponse } from "next";
-import { Upload } from "@aws-sdk/lib-storage";
+import { PutObjectCommand } from "@aws-sdk/client-s3";

 import { createNextApiContext } from "@kan/api/trpc";
-import { assertPermission } from "@kan/api/utils/permissions";
-import { withRateLimit } from "@kan/api/utils/rateLimit";
 import * as cardRepo from "@kan/db/repository/card.repo";
 import * as cardActivityRepo from "@kan/db/repository/cardActivity.repo";
 import * as cardAttachmentRepo from "@kan/db/repository/cardAttachment.repo";
-import { createS3Client, generateUID } from "@kan/shared/utils";
+import { generateUID } from "@kan/shared/utils";

 import { env } from "~/env";
+import { withRateLimit } from "@kan/api/utils/rateLimit";
+import { createS3Client } from "@kan/shared/utils";
+import { assertPermission } from "@kan/api/utils/permissions";

-// FIXME: Respect the environment variable: NEXT_API_BODY_SIZE_LIMIT
 const MAX_SIZE_BYTES = 50 * 1024 * 1024; // 50MB

 export const config = {
@@ -90,19 +90,16 @@ export default withRateLimit(

      const client = createS3Client();

-      const upload = new Upload({
-        client,
-        params: {
+      // Upload the file to S3
+      await client.send(
+        new PutObjectCommand({
          Bucket: bucket,
          Key: s3Key,
          Body: req,
          ContentType: contentType,
          ContentLength: contentLength,
-        },
-        leavePartsOnError: false,
-      });
-
-      await upload.done();
+        }),
+      );

      // Create attachment record and log activity
      const attachment = await cardAttachmentRepo.create(db, {
@@ -115,15 +112,9 @@ export default withRateLimit(
        createdBy: user.id,
      });

-      if (!attachment) {
-        return res.status(500).json({ error: "Failed to create attachment" });
-      }
-
      await cardActivityRepo.create(db, {
        type: "card.updated.attachment.added",
        cardId: card.id,
-        attachmentId: attachment.id,
-        toTitle: originalFilenameHeader,
        createdBy: user.id,
      });

@@ -134,3 +125,4 @@ export default withRateLimit(
    }
  },
 );
+
--- a/apps/web/src/views/board/components/Card.tsx
+++ b/apps/web/src/views/board/components/Card.tsx
@@ -66,8 +66,8 @@ const Card = ({
  const hasDueDate = !!dueDate;

  return (
-    <div className="flex flex-col overflow-hidden rounded-md border border-light-200 bg-light-50 px-3 py-2 text-sm text-neutral-900 dark:border-dark-200 dark:bg-dark-200 dark:text-dark-1000 dark:hover:bg-dark-300">
-      <span className="break-words">{title}</span>
+    <div className="flex flex-col rounded-md border border-light-200 bg-light-50 px-3 py-2 text-sm text-neutral-900 dark:border-dark-200 dark:bg-dark-200 dark:text-dark-1000 dark:hover:bg-dark-300">
+      <span>{title}</span>
      {labels.length ||
      members.length ||
      checklists.length > 0 ||
--- a/apps/web/src/views/board/components/UpdateBoardSlugButton.tsx
+++ b/apps/web/src/views/board/components/UpdateBoardSlugButton.tsx
@@ -1,40 +1,24 @@
-import { Fragment } from "react";
+import Link from "next/link";
 import { t } from "@lingui/core/macro";
 import { env } from "next-runtime-env";
 import { HiLink } from "react-icons/hi";

 import { Tooltip } from "~/components/Tooltip";
-import { usePopup } from "~/providers/popup";
-
-const displayBaseUrl =
-  env("NEXT_PUBLIC_KAN_ENV") === "cloud"
-    ? "kan.bn"
-    : env("NEXT_PUBLIC_BASE_URL");
-
-const linkBaseUrl = env("NEXT_PUBLIC_BASE_URL");
-
-const pathSeparator = (
-  <div className="mx-1.5 h-4 w-px rotate-[20deg] bg-gray-300 dark:bg-dark-600" />
-);

 const UpdateBoardSlugButton = ({
  handleOnClick,
  workspaceSlug,
  boardSlug,
-  boardPublicId,
-  visibility,
  isLoading,
  canEdit,
 }: {
  handleOnClick: () => void;
  workspaceSlug: string;
  boardSlug: string;
-  boardPublicId: string;
-  visibility: "public" | "private";
  isLoading: boolean;
  canEdit: boolean;
 }) => {
-  const { showPopup } = usePopup();
+  if (!isLoading && (!workspaceSlug || !boardSlug)) return <></>;

  if (isLoading) {
    return (
@@ -42,55 +26,44 @@ const UpdateBoardSlugButton = ({
    );
  }

-  if (!workspaceSlug || !boardSlug || !boardPublicId) return <></>;
-
-  const isPublic = visibility === "public";
-  const boardUrl = isPublic
-    ? `${linkBaseUrl}/${workspaceSlug}/${boardSlug}`
-    : `${linkBaseUrl}/boards/${boardPublicId}`;
-
-  const pathSegments = isPublic
-    ? [displayBaseUrl, workspaceSlug, boardSlug]
-    : [displayBaseUrl, "boards", boardPublicId];
-
  return (
    <Tooltip
-      content={!canEdit ? t`You don't have permission` : undefined}
+      content={!canEdit && !isLoading ? t`You don't have permission` : undefined}
    >
      <button
        onClick={canEdit ? handleOnClick : undefined}
        disabled={!canEdit || isLoading}
        className="hidden cursor-pointer items-center gap-2 rounded-full border-[1px] bg-light-50 p-1 pl-4 pr-1 text-sm text-light-950 hover:bg-light-100 disabled:cursor-not-allowed disabled:opacity-60 dark:border-dark-600 dark:bg-dark-50 dark:text-dark-900 dark:hover:bg-dark-100 xl:flex"
      >
-        <div className="flex items-center">
-          {pathSegments.map((segment, i) => (
-            <Fragment key={i}>
-              {i > 0 && pathSeparator}
-              <span>{segment}</span>
-            </Fragment>
-          ))}
-        </div>
-        <button
-          type="button"
-          onClick={(e) => {
-            e.stopPropagation();
-            navigator.clipboard.writeText(boardUrl).then(
-              () =>
-                showPopup({
-                  header: t`Link copied`,
-                  icon: "success",
-                  message: t`Board URL copied to clipboard`,
-                }),
-            ).catch(() => undefined);
-          }}
-          className="flex h-7 w-7 items-center justify-center rounded-full hover:bg-light-200 dark:hover:bg-dark-200"
-          aria-label={t`Copy board link`}
-        >
-          <HiLink className="h-[13px] w-[13px]" />
-        </button>
-      </button>
+      <div className="flex items-center">
+        <span>
+          {env("NEXT_PUBLIC_KAN_ENV") === "cloud"
+            ? "kan.bn"
+            : env("NEXT_PUBLIC_BASE_URL")}
+        </span>
+        <div className="mx-1.5 h-4 w-px rotate-[20deg] bg-gray-300 dark:bg-dark-600"></div>
+        <span>{workspaceSlug}</span>
+        <div className="mx-1.5 h-4 w-px rotate-[20deg] bg-gray-300 dark:bg-dark-600"></div>
+        <span>{boardSlug}</span>
+      </div>
+      <Link
+        href={`${env("NEXT_PUBLIC_BASE_URL")}/${workspaceSlug}/${boardSlug}`}
+        target="_blank"
+        rel="noopener noreferrer"
+        onClick={(e) => {
+          e.stopPropagation();
+          if (!canEdit) {
+            e.preventDefault();
+          }
+        }}
+        className="flex h-7 w-7 items-center justify-center rounded-full hover:bg-light-200 dark:hover:bg-dark-200"
+      >
+        <HiLink className="h-[13px] w-[13px]" />
+      </Link>
+    </button>
    </Tooltip>
  );
 };

+
 export default UpdateBoardSlugButton;
--- a/apps/web/src/views/board/components/UpdateBoardSlugForm.tsx
+++ b/apps/web/src/views/board/components/UpdateBoardSlugForm.tsx
@@ -156,7 +156,7 @@ export function UpdateBoardSlugForm({
        <div className="flex items-center gap-2">
          <Button
            variant="secondary"
-            href="/settings/workspace"
+            href="/settings?tab=workspace"
            onClick={closeModal}
          >
            {t`Edit workspace URL`}
--- a/apps/web/src/views/board/index.tsx
+++ b/apps/web/src/views/board/index.tsx
@@ -58,14 +58,13 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
  const [selectedPublicListId, setSelectedPublicListId] =
    useState<PublicListId>("");
  const [isInitialLoading, setIsInitialLoading] = useState(true);
-
+  
  const { ref: scrollRef, onMouseDown } = useDragToScroll({
    enabled: true,
    direction: "horizontal",
  });

-  const { canCreateList, canEditList, canEditCard, canEditBoard } =
-    usePermissions();
+  const { canCreateList, canEditList, canEditCard, canEditBoard } = usePermissions();

  const { tooltipContent: createListShortcutTooltipContent } =
    useKeyboardShortcut({
@@ -418,9 +417,10 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
                {...register("name")}
                onBlur={canEditBoard ? handleSubmit(onSubmit) : undefined}
                readOnly={!canEditBoard}
-                className="block border-0 bg-transparent p-0 py-0 font-bold leading-[2.3rem] tracking-tight text-neutral-900 focus:ring-0 focus-visible:outline-none disabled:cursor-not-allowed dark:text-dark-1000 sm:text-[1.2rem]"
+                className="block border-0 bg-transparent p-0 py-0 font-bold leading-[2.3rem] tracking-tight text-neutral-900 focus:ring-0 focus-visible:outline-none dark:text-dark-1000 sm:text-[1.2rem] disabled:cursor-not-allowed"
              />
            </form>
+
          )}
          {!boardData && !isLoading && (
            <p className="order-2 block p-0 py-0 font-bold leading-[2.3rem] tracking-tight text-neutral-900 dark:text-dark-1000 sm:text-[1.2rem] md:order-1">
@@ -443,8 +443,6 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
                  isLoading={isLoading}
                  workspaceSlug={workspace.slug ?? ""}
                  boardSlug={boardData?.slug ?? ""}
-                  boardPublicId={boardId ?? ""}
-                  visibility={boardData?.visibility ?? "private"}
                  canEdit={canEditBoard}
                />
                <VisibilityButton
@@ -598,13 +596,12 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
                                              ? `/templates/${boardId}/cards/${card.publicId}`
                                              : `/cards/${card.publicId}`
                                          }
-                                          className={`mb-2 flex !cursor-pointer flex-col ${
-                                            card.publicId.startsWith(
-                                              "PLACEHOLDER",
-                                            )
-                                              ? "pointer-events-none"
-                                              : ""
-                                          }`}
+                                          className={`mb-2 flex !cursor-pointer flex-col ${card.publicId.startsWith(
+                                            "PLACEHOLDER",
+                                          )
+                                            ? "pointer-events-none"
+                                            : ""
+                                            }`}
                                          ref={provided.innerRef}
                                          {...provided.draggableProps}
                                          {...provided.dragHandleProps}
--- a/apps/web/src/views/boards/components/TemplateBoards.tsx
+++ b/apps/web/src/views/boards/components/TemplateBoards.tsx
@@ -23,18 +23,6 @@ export const getTemplates = (): Template[] => [
    lists: [t`Backlog`, t`To Do`, t`In Progress`, t`Code Review`, t`Done`],
    labels: [t`Bug`, t`Feature`, t`Enhancement`, t`Critical`, t`Documentation`],
  },
-  {
-    id: "roadmap-basic",
-    name: t`Basic Roadmap`,
-    lists: [t`Requested`, t`Planned`, t`In Progress`, t`Done`],
-    labels: [t`Feature`, t`Enhancement`, t`Critical`, t`Documentation`],
-  },
-  {
-    id: "roadmap-extended",
-    name: t`Extended Roadmap`,
-    lists: [t`Requested`, t`Under Review`, t`Planned`, t`In Progress`, t`Done`, t`Rejected`],
-    labels: [t`Feature`, t`Enhancement`, t`Critical`, t`Documentation`],
-  },
  {
    id: "content-creation",
    name: t`Content Creation`,
--- a/apps/web/src/views/card/components/ActivityList.tsx
+++ b/apps/web/src/views/card/components/ActivityList.tsx
@@ -8,7 +8,6 @@ import {
  HiOutlineArrowRight,
  HiOutlineCheckCircle,
  HiOutlineClock,
-  HiOutlinePaperClip,
  HiOutlinePencil,
  HiOutlinePlus,
  HiOutlineTag,
@@ -32,16 +31,6 @@ import Comment from "./Comment";
 type ActivityType =
  NonNullable<GetCardByIdOutput>["activities"][number]["type"];

-type ActivityWithMergedLabels =
-  GetCardActivitiesOutput["activities"][number] & {
-    mergedLabels?: string[];
-    attachment?: {
-      publicId: string;
-      filename: string;
-      originalFilename: string;
-    } | null;
-  };
-
 const truncate = (value: string | null, maxLength = 50) => {
  if (!value) return value;
  return value.length > maxLength ? `${value.slice(0, maxLength - 1)}…` : value;
@@ -68,7 +57,6 @@ const getActivityText = ({
  toDueDate,
  dateLocale,
  mergedLabels,
-  attachmentName,
 }: {
  type: ActivityType;
  toTitle: string | null;
@@ -83,7 +71,6 @@ const getActivityText = ({
  toDueDate?: Date | null;
  dateLocale: DateFnsLocale;
  mergedLabels?: string[];
-  attachmentName?: string | null;
 }) => {
  const displayName = memberName ?? memberEmail ?? t`Member`;
  const TextHighlight = ({ children }: { children: React.ReactNode }) => (
@@ -137,8 +124,6 @@ const getActivityText = ({
    "card.updated.checklist.item.completed": t`completed a checklist item`,
    "card.updated.checklist.item.uncompleted": t`marked a checklist item as incomplete`,
    "card.updated.checklist.item.deleted": t`deleted a checklist item`,
-    "card.updated.attachment.added": t`added an attachment`,
-    "card.updated.attachment.removed": t`removed an attachment`,
    "card.updated.dueDate.added": t`set the due date`,
    "card.updated.dueDate.updated": t`updated the due date`,
    "card.updated.dueDate.removed": t`removed the due date`,
@@ -271,27 +256,6 @@ const getActivityText = ({
    );
  }

-  if (type === "card.updated.attachment.added") {
-    const filename = attachmentName ?? toTitle;
-    if (!filename) return baseText;
-    return (
-      <Trans>
-        added an attachment <TextHighlight>{truncate(filename)}</TextHighlight>
-      </Trans>
-    );
-  }
-
-  if (type === "card.updated.attachment.removed") {
-    const filename = attachmentName ?? fromTitle;
-    if (!filename) return baseText;
-    return (
-      <Trans>
-        removed an attachment{" "}
-        <TextHighlight>{truncate(filename)}</TextHighlight>
-      </Trans>
-    );
-  }
-
  if (type === "card.updated.dueDate.added" && toDueDate) {
    const showYear = !isSameYear(toDueDate, new Date());
    const formattedDate = format(
@@ -344,8 +308,6 @@ const ACTIVITY_ICON_MAP: Partial<Record<ActivityType, React.ReactNode | null>> =
    "card.updated.checklist.item.completed": <HiOutlineCheckCircle />,
    "card.updated.checklist.item.uncompleted": <HiOutlineCheckCircle />,
    "card.updated.checklist.item.deleted": <HiOutlineTrash />,
-    "card.updated.attachment.added": <HiOutlinePaperClip />,
-    "card.updated.attachment.removed": <HiOutlinePaperClip />,
    "card.updated.dueDate.added": <HiOutlineClock />,
    "card.updated.dueDate.updated": <HiOutlineClock />,
    "card.updated.dueDate.removed": <HiOutlineClock />,
@@ -379,7 +341,7 @@ const ActivityList = ({
  isAdmin?: boolean;
  isViewOnly?: boolean;
 }) => {
-  const { dateLocale } = useLocalisation();
+  const { dateLocale, locale } = useLocalisation();
  const { data: sessionData } = authClient.useSession();
  const utils = api.useUtils();
  const [allActivities, setAllActivities] = useState<
@@ -429,21 +391,25 @@ const ActivityList = ({
              cursor: nextCursor,
            });

-            const existingIds = new Set(
-              currentActivities.map((a) => a.publicId),
-            );
-            const newActivities = nextPage.activities.filter(
-              (a: { publicId: string }) => !existingIds.has(a.publicId),
-            );
-            currentActivities = [...currentActivities, ...newActivities];
-            currentHasMore = nextPage.hasMore;
+            if (nextPage) {
+              const existingIds = new Set(
+                currentActivities.map((a) => a.publicId),
+              );
+              const newActivities = nextPage.activities.filter(
+                (a: { publicId: string }) => !existingIds.has(a.publicId),
+              );
+              currentActivities = [...currentActivities, ...newActivities];
+              currentHasMore = nextPage.hasMore;
+            } else {
+              break;
+            }
          }

          setAllActivities(currentActivities);
          setHasMore(false);
        };

-        void fetchAllRemaining();
+        fetchAllRemaining();
      } else {
        setAllActivities(firstPageData.activities);
        setHasMore(firstPageData.hasMore);
@@ -470,15 +436,17 @@ const ActivityList = ({
        cursor: nextCursor,
      });

-      const existingIds = new Set(allActivities.map((a) => a.publicId));
-      const newActivities = nextPage.activities.filter(
-        (a: { publicId: string }) => !existingIds.has(a.publicId),
-      );
-      setAllActivities((prev) => [...prev, ...newActivities]);
-      setHasMore(nextPage.hasMore);
+      if (nextPage) {
+        const existingIds = new Set(allActivities.map((a) => a.publicId));
+        const newActivities = nextPage.activities.filter(
+          (a: { publicId: string }) => !existingIds.has(a.publicId),
+        );
+        setAllActivities((prev) => [...prev, ...newActivities]);
+        setHasMore(nextPage.hasMore);

-      if (!nextPage.hasMore) {
-        isFullyExpandedRef.current = true;
+        if (!nextPage.hasMore) {
+          isFullyExpandedRef.current = true;
+        }
      }
    } finally {
      setIsLoadingMore(false);
@@ -505,10 +473,7 @@ const ActivityList = ({
          fromDueDate: activity.fromDueDate ?? null,
          toDueDate: activity.toDueDate ?? null,
          dateLocale: dateLocale,
-          mergedLabels: (activity as ActivityWithMergedLabels).mergedLabels,
-          attachmentName:
-            (activity as ActivityWithMergedLabels).attachment?.originalFilename ??
-            null,
+          mergedLabels: (activity as any).mergedLabels,
        });

        if (activity.type === "card.updated.comment.added")
--- a/apps/web/src/views/card/components/Comment.tsx
+++ b/apps/web/src/views/card/components/Comment.tsx
@@ -1,13 +1,12 @@
 import { t } from "@lingui/core/macro";
 import { formatDistanceToNow } from "date-fns";
 import { useState } from "react";
+import ContentEditable from "react-contenteditable";
 import { useForm } from "react-hook-form";
 import { HiEllipsisHorizontal, HiPencil, HiTrash } from "react-icons/hi2";

 import Avatar from "~/components/Avatar";
 import Button from "~/components/Button";
-import Editor from "~/components/Editor";
-import type { WorkspaceMember } from "~/components/Editor";
 import Dropdown from "~/components/Dropdown";
 import { usePermissions } from "~/hooks/usePermissions";
 import { useModal } from "~/providers/modal";
@@ -30,6 +29,7 @@ const Comment = ({
  createdAt,
  comment,
  isAuthor,
+  isAdmin,
  isEdited = false,
  isViewOnly = false,
 }: {
@@ -42,6 +42,7 @@ const Comment = ({
  createdAt: string;
  comment: string | undefined;
  isAuthor: boolean;
+  isAdmin: boolean;
  isEdited: boolean;
  isViewOnly: boolean;
 }) => {
@@ -56,30 +57,6 @@ const Comment = ({
    },
  });

-  const { data: cardData } = api.card.byId.useQuery(
-    {
-      cardPublicId,
-    },
-    {
-      enabled: !!cardPublicId && cardPublicId.length >= 12,
-    },
-  );
-
-  const workspaceMembers: WorkspaceMember[] =
-    cardData?.list.board.workspace.members
-      .filter((member) => member.email)
-      .map((member) => ({
-        publicId: member.publicId,
-        email: member.email,
-        user: member.user
-          ? {
-              id: member.user.id,
-              name: member.user.name ?? null,
-              image: member.user.image ?? null,
-            }
-          : null,
-      })) ?? [];
-
  if (!publicId) return null;

  const updateCommentMutation = api.card.updateComment.useMutation({
@@ -165,28 +142,21 @@ const Comment = ({
        )}
      </div>
      {!isEditing ? (
-        <div className="mt-2">
-          <Editor
-            content={comment ?? null}
-            readOnly={true}
-            workspaceMembers={workspaceMembers}
-            enableYouTubeEmbed={false}
-            disableHeadings={true}
-          />
-        </div>
+        <ContentEditable
+          html={comment ?? ""}
+          disabled={true}
+          className="break-anywhere mt-2 text-sm"
+        />
      ) : (
        <form onSubmit={handleSubmit(onSubmit)}>
-          <div className="mt-2">
-            <Editor
-              content={watch("comment")}
-              onChange={(value) => setValue("comment", value)}
-              workspaceMembers={workspaceMembers}
-              enableYouTubeEmbed={false}
-              placeholder={t`Add comment... (type '/' to open commands or '@' to mention)`}
-              disableHeadings={true}
-            />
-          </div>
-          <div className="flex justify-end space-x-2 mt-2">
+          <ContentEditable
+            placeholder={t`Add a comment...`}
+            html={watch("comment")}
+            disabled={false}
+            onChange={(e) => setValue("comment", e.target.value)}
+            className="block w-full max-w-[800px] border-0 bg-transparent py-1.5 text-sm text-light-900 focus-visible:outline-none dark:text-dark-1000 sm:text-sm sm:leading-6"
+          />
+          <div className="flex justify-end space-x-2">
            <Button
              size="sm"
              variant="ghost"
--- a/apps/web/src/views/card/components/Dropdown.tsx
+++ b/apps/web/src/views/card/components/Dropdown.tsx
@@ -1,7 +1,6 @@
 import { t } from "@lingui/core/macro";
 import {
  HiEllipsisHorizontal,
-  HiLink,
  HiOutlineCheckCircle,
  HiOutlineTrash,
 } from "react-icons/hi2";
@@ -11,54 +10,18 @@ import { authClient } from "@kan/auth/client";
 import Dropdown from "~/components/Dropdown";
 import { usePermissions } from "~/hooks/usePermissions";
 import { useModal } from "~/providers/modal";
-import { usePopup } from "~/providers/popup";

 export default function CardDropdown({
-  cardPublicId,
-  isTemplate,
-  boardPublicId,
  cardCreatedBy,
 }: {
-  cardPublicId: string;
-  isTemplate?: boolean;
-  boardPublicId?: string;
  cardCreatedBy?: string | null;
 }) {
  const { openModal } = useModal();
-  const { showPopup } = usePopup();
  const { canEditCard, canDeleteCard } = usePermissions();
  const { data: session } = authClient.useSession();
  const isCreator = cardCreatedBy && session?.user.id === cardCreatedBy;

-  const handleCopyCardLink = async () => {
-    const path =
-      isTemplate && boardPublicId
-        ? `/templates/${boardPublicId}/cards/${cardPublicId}`
-        : `/cards/${cardPublicId}`;
-    const url = `${window.location.origin}${path}`;
-    try {
-      await navigator.clipboard.writeText(url);
-      showPopup({
-        header: t`Link copied`,
-        icon: "success",
-        message: t`Card URL copied to clipboard`,
-      });
-    } catch (error) {
-      console.error(error);
-      showPopup({
-        header: t`Unable to copy link`,
-        icon: "error",
-        message: t`Please try again.`,
-      });
-    }
-  };
-
  const items = [
-    {
-      label: t`Copy card link`,
-      action: handleCopyCardLink,
-      icon: <HiLink className="h-[16px] w-[16px] text-dark-900" />,
-    },
    ...(canEditCard
      ? [
          {
--- a/apps/web/src/views/card/components/NewCommentForm.tsx
+++ b/apps/web/src/views/card/components/NewCommentForm.tsx
@@ -1,9 +1,8 @@
 import { t } from "@lingui/core/macro";
+import ContentEditable from "react-contenteditable";
 import { useForm } from "react-hook-form";
 import { HiOutlineArrowUp } from "react-icons/hi2";

-import Editor from "~/components/Editor";
-import type { WorkspaceMember } from "~/components/Editor";
 import LoadingSpinner from "~/components/LoadingSpinner";
 import { usePermissions } from "~/hooks/usePermissions";
 import { usePopup } from "~/providers/popup";
@@ -14,13 +13,7 @@ interface FormValues {
  comment: string;
 }

-const NewCommentForm = ({
-  cardPublicId,
-  workspaceMembers,
-}: {
-  cardPublicId: string;
-  workspaceMembers: WorkspaceMember[];
-}) => {
+const NewCommentForm = ({ cardPublicId }: { cardPublicId: string }) => {
  const utils = api.useUtils();
  const { showPopup } = usePopup();
  const { canCreateComment } = usePermissions();
@@ -30,6 +23,10 @@ const NewCommentForm = ({
    },
  });

+  const queryParams = {
+    cardPublicId,
+  };
+
  const addCommentMutation = api.card.addComment.useMutation({
    onError: (_error, _newList) => {
      showPopup({
@@ -60,13 +57,18 @@ const NewCommentForm = ({
      onSubmit={handleSubmit(onSubmit)}
      className="flex w-full max-w-[800px] flex-col rounded-xl border border-light-600 bg-light-100 p-4 text-light-900 focus-visible:outline-none dark:border-dark-400 dark:bg-dark-100 dark:text-dark-1000 sm:text-sm sm:leading-6"
    >
-      <Editor
-        content={watch("comment")}
-        onChange={(value) => setValue("comment", value)}
-        workspaceMembers={workspaceMembers}
-        enableYouTubeEmbed={false}
-        placeholder={t`Add comment... (type '/' to open commands or '@' to mention)`}
-        disableHeadings={true}
+      <ContentEditable
+        placeholder={t`Add a comment...`}
+        html={watch("comment")}
+        disabled={false}
+        onChange={(e) => setValue("comment", e.target.value)}
+        className="block w-full border-0 bg-transparent py-1.5 text-light-900 focus-visible:outline-none dark:text-dark-1000 sm:text-sm sm:leading-6"
+        onKeyDown={async (e) => {
+          if (e.key === "Enter" && e.shiftKey) {
+            e.preventDefault();
+            await handleSubmit(onSubmit)();
+          }
+        }}
      />
      <div className="flex justify-end">
        <button
--- a/apps/web/src/views/card/index.tsx
+++ b/apps/web/src/views/card/index.tsx
@@ -4,9 +4,6 @@ import { t } from "@lingui/core/macro";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { IoChevronForwardSharp } from "react-icons/io5";
-import { HiXMark } from "react-icons/hi2";
-
-import { authClient } from "@kan/auth/client";

 import Avatar from "~/components/Avatar";
 import Editor from "~/components/Editor";
@@ -17,6 +14,8 @@ import Modal from "~/components/modal";
 import { NewWorkspaceForm } from "~/components/NewWorkspaceForm";
 import { PageHead } from "~/components/PageHead";
 import { EditYouTubeModal } from "~/components/YouTubeEmbed/EditYouTubeModal";
+import { authClient } from "@kan/auth/client";
+
 import { usePermissions } from "~/hooks/usePermissions";
 import { useModal } from "~/providers/modal";
 import { usePopup } from "~/providers/popup";
@@ -168,6 +167,7 @@ export default function CardPage({ isTemplate }: { isTemplate?: boolean }) {
  const {
    modalContentType,
    entityId,
+    openModal,
    getModalState,
    clearModalState,
    isOpen,
@@ -198,24 +198,8 @@ export default function CardPage({ isTemplate }: { isTemplate?: boolean }) {
  };

  const board = card?.list.board;
-  const workspaceMembers = board?.workspace.members;
  const boardId = board?.publicId;

-  const editorWorkspaceMembers =
-    workspaceMembers
-      ?.filter((member) => member.email)
-      .map((member) => ({
-        publicId: member.publicId,
-        email: member.email,
-        user: member.user
-          ? {
-              id: member.user.id,
-              name: member.user.name ?? null,
-              image: member.user.image ?? null,
-            }
-          : null,
-      })) ?? [];
-
  const updateCard = api.card.update.useMutation({
    onError: () => {
      showPopup({
@@ -302,7 +286,6 @@ export default function CardPage({ isTemplate }: { isTemplate?: boolean }) {

  if (!cardId) return <></>;

-
  return (
    <>
      <PageHead
@@ -334,19 +317,7 @@ export default function CardPage({ isTemplate }: { isTemplate?: boolean }) {
                </Link>
              </div>
              <div className="flex items-center gap-2">
-                <Dropdown
-                  cardPublicId={cardId}
-                  isTemplate={isTemplate}
-                  boardPublicId={boardId}
-                  cardCreatedBy={card?.createdBy}
-                />
-                <Link
-                  href={`/${isTemplate ? "templates" : "boards"}/${boardId}`}
-                  className="flex h-7 w-7 items-center justify-center rounded-[5px] text-light-900 hover:bg-light-200 dark:text-dark-900 dark:hover:bg-dark-200"
-                  aria-label={t`Close`}
-                >
-                  <HiXMark className="h-5 w-5" />
-                </Link>
+                <Dropdown cardCreatedBy={card?.createdBy} />
              </div>
            </>
          )}
@@ -403,15 +374,9 @@ export default function CardPage({ isTemplate }: { isTemplate?: boolean }) {
                      <div className="mt-2">
                        <Editor
                          content={card.description}
-                          onChange={
-                            canEdit
-                              ? (e) => setValue("description", e)
-                              : undefined
-                          }
-                          onBlur={
-                            canEdit ? () => handleSubmit(onSubmit)() : undefined
-                          }
-                          workspaceMembers={workspaceMembers ?? []}
+                          onChange={canEdit ? (e) => setValue("description", e) : undefined}
+                          onBlur={canEdit ? () => handleSubmit(onSubmit)() : undefined}
+                          workspaceMembers={board?.workspace.members ?? []}
                          readOnly={!canEdit}
                        />
                      </div>
@@ -455,10 +420,7 @@ export default function CardPage({ isTemplate }: { isTemplate?: boolean }) {
                    </div>
                    {!isTemplate && (
                      <div className="mt-6">
-                        <NewCommentForm
-                          cardPublicId={cardId}
-                          workspaceMembers={editorWorkspaceMembers}
-                        />
+                        <NewCommentForm cardPublicId={cardId} />
                      </div>
                    )}
                  </div>
--- a/apps/web/src/views/pricing/components/FeatureComparisonTable.tsx
+++ b/apps/web/src/views/pricing/components/FeatureComparisonTable.tsx
@@ -1,587 +1,293 @@
 import { t } from "@lingui/core/macro";
-import React, { useEffect, useRef, useState } from "react";
 import { HiCheckCircle, HiXCircle } from "react-icons/hi2";
-import { twMerge } from "tailwind-merge";
+
+interface Feature {
+  key: string;
+  label: string;
+  kan: boolean | string;
+  trello: boolean | string;
+}
+
+interface Section {
+  name: string;
+  features: Feature[];
+}

 type FrequencyValue = "monthly" | "annually";

-interface PlanFeature {
-  key: string;
-  label: string;
-  free: string | boolean | { text: string; highlight?: string };
-  teams: string | boolean | { text: string; highlight?: string };
-  pro: string | boolean | { text: string; highlight?: string };
-  enterprise: string | boolean | { text: string; highlight?: string };
-}
-
-interface FeatureSection {
-  name: string;
-  features: PlanFeature[];
-}
+const CellValue = ({ value }: { value: boolean | string }) => {
+  if (typeof value === "string") {
+    return (
+      <span className="text-sm text-dark-900 dark:text-dark-900">{value}</span>
+    );
+  }
+  return value ? (
+    <HiCheckCircle className="h-5 w-5 text-light-950 dark:text-dark-1000" />
+  ) : (
+    <HiXCircle className="h-5 w-5 text-light-700 dark:text-dark-600" />
+  );
+};

 const FeatureComparisonTable = ({
-  frequencyValue: _frequencyValue,
+  frequencyValue,
 }: {
  frequencyValue: FrequencyValue;
 }) => {
-  // Keep pricing column headers visible as you scroll
-  const containerRef = useRef<HTMLDivElement | null>(null);
-  const [isHeaderFixed, setIsHeaderFixed] = useState(false);
-  const [headerRect, setHeaderRect] = useState<{ left: number; width: number }>({
-    left: 0,
-    width: 0,
-  });
-
-  useEffect(() => {
-    const HEADER_OFFSET = 64; // px; matches fixed top nav height
-
-    const handleScroll = () => {
-      if (!containerRef.current) return;
-
-      // Hide fixed header on mobile (screens smaller than 620px)
-      if (window.innerWidth < 620) {
-        setIsHeaderFixed(false);
-        return;
-      }
-
-      const rect = containerRef.current.getBoundingClientRect();
-      const pastHeader = rect.top <= HEADER_OFFSET;
-      const aboveBottom = rect.bottom > HEADER_OFFSET + 40;
-
-      const shouldFix = pastHeader && aboveBottom;
-      setIsHeaderFixed(shouldFix);
-
-      if (shouldFix) {
-        setHeaderRect({
-          left: rect.left,
-          width: rect.width,
-        });
-      }
-    };
-
-    handleScroll();
-    window.addEventListener("scroll", handleScroll, { passive: true });
-    window.addEventListener("resize", handleScroll);
-    return () => {
-      window.removeEventListener("scroll", handleScroll);
-      window.removeEventListener("resize", handleScroll);
-    };
-  }, []);
-  const planSpecificLimits: PlanFeature[] = [
-    {
-      key: "boards",
-      label: t`Boards`,
-      free: { text: t`Unlimited boards`, highlight: "Unlimited" },
-      teams: { text: t`Unlimited boards`, highlight: "Unlimited" },
-      pro: { text: t`Unlimited boards`, highlight: "Unlimited" },
-      enterprise: { text: t`Unlimited boards`, highlight: "Unlimited" },
-    },
-    {
-      key: "members",
-      label: t`Members`,
-      free: { text: t`1 user`, highlight: "1" },
-      teams: { text: t`Per-seat pricing`, highlight: "Per-seat" },
-      pro: { text: t`Unlimited members`, highlight: "Unlimited" },
-      enterprise: { text: t`Unlimited members`, highlight: "Unlimited" },
-    },
-    {
-      key: "file-uploads",
-      label: t`File uploads`,
-      free: { text: t`10mb file uploads`, highlight: "10mb" },
-      teams: { text: t`Unlimited file uploads`, highlight: "Unlimited" },
-      pro: { text: t`Unlimited file uploads`, highlight: "Unlimited" },
-      enterprise: { text: t`Unlimited file uploads`, highlight: "Unlimited" },
-    },
-      {
-        key: "workspace-username",
-        label: t`Workspace username`,
-        free: { text: t`Default username`, highlight: "Default" },
-        teams: { text: t`Default username`, highlight: "Default" },
-        pro: { text: t`Custom username`, highlight: "Custom" },
-        enterprise: { text: t`Custom username`, highlight: "Custom" },
-      },
-  ];
-
-  const coreFeatures: PlanFeature[] = [
-    {
-      key: "checklists",
-      label: t`Checklists`,
-      free: true,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "custom-templates",
-      label: t`Board templates`,
-      free: true,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "labels-filters",
-      label: t`Labels & filters`,
-      free: true,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "board-visibility",
-      label: t`Board visibility`,
-      free: true,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "search",
-      label: t`Intelligent search`,
-      free: true,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "activity-log",
-      label: t`Activity log`,
-      free: true,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "comments",
-      label: t`Comments`,
-      free: true,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "roles-permissions",
-      label: t`Roles & permissions`,
-      free: false,
-      teams: false,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "custom-branding",
-      label: t`Custom branding`,
-      free: false,
-      teams: false,
-      pro: true,
-      enterprise: true,
-    },
-  ];
-
-  const collaborationFeatures: PlanFeature[] = [
-    {
-      key: "mentions",
-      label: t`Mentions`,
-      free: false,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "email-notifications",
-      label: t`Email notifications`,
-      free: false,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "assignees",
-      label: t`Assignees`,
-      free: false,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "invite-links",
-      label: t`Invite links`,
-      free: false,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-  ];
-
-  const importsFeatures: PlanFeature[] = [
-    {
-      key: "import-export",
-      label: t`Trello`,
-      free: true,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-  ];
-
-  const platformFeatures: PlanFeature[] = [
-    {
-      key: "open-source",
-      label: t`Open source`,
-      free: true,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "rest-api",
-      label: t`API`,
-      free: { text: t`Limited API access` },
-      teams: { text: t`Full API access` },
-      pro: { text: t`Full API access` },
-      enterprise: { text: t`Full API access` },
-    },
-    {
-      key: "self-hostable",
-      label: t`On-premise`,
-      free: false,
-      teams: false,
-      pro: false,
-      enterprise: true,
-    },
-  ];
-
-  const securityFeatures: PlanFeature[] = [
-    {
-      key: "sso",
-      label: t`SSO`,
-      free: { text: t`Google SSO` },
-      teams: { text: t`Google SSO` },
-      pro: { text: t`Google SSO` },
-      enterprise: { text: t`Google SSO + SAML` },
-    },
-    {
-      key: "admin-roles",
-      label: t`Admin roles`,
-      free: { text: t`Admin roles` },
-      teams: { text: t`Admin roles` },
-      pro: { text: t`Admin roles` },
-      enterprise: { text: t`Advanced admin roles` },
-    },
-  ];
-
-  const supportFeatures: PlanFeature[] = [
-    {
-      key: "priority-email-support",
-      label: t`Priority email support`,
-      free: false,
-      teams: true,
-      pro: true,
-      enterprise: true,
-    },
-    {
-      key: "account-manager",
-      label: t`Account manager`,
-      free: false,
-      teams: false,
-      pro: false,
-      enterprise: true,
-    },
-    {
-      key: "sla",
-      label: t`SLA`,
-      free: false,
-      teams: false,
-      pro: false,
-      enterprise: true,
-    },
-  ];
-
-  const sections: FeatureSection[] = [
-    {
-      name: "",
-      features: planSpecificLimits,
-    },
+  const sections: Section[] = [
    {
      name: t`Core features`,
-      features: coreFeatures,
+      features: [
+        {
+          key: "ulimited-workspaces",
+          label: t`Unlimited workspaces`,
+          kan: true,
+          trello: false,
+        },
+        {
+          key: "unlimited-boards",
+          label: t`Unlimited boards`,
+          kan: true,
+          trello: false,
+        },
+        {
+          key: "unlimited-lists",
+          label: t`Unlimited lists`,
+          kan: true,
+          trello: true,
+        },
+        {
+          key: "unlimited-cards",
+          label: t`Unlimited cards`,
+          kan: true,
+          trello: true,
+        },
+        {
+          key: "activity-log",
+          label: t`Activity log`,
+          kan: true,
+          trello: true,
+        },
+        {
+          key: "templates",
+          label: t`Custom templates`,
+          kan: true,
+          trello: false,
+        },
+        { key: "labels", label: t`Labels & filters`, kan: true, trello: true },
+        { key: "checklists", label: t`Checklists`, kan: true, trello: true },
+        {
+          key: "import",
+          label: t`Import from Trello`,
+          kan: true,
+          trello: false,
+        },
+        {
+          key: "visibility",
+          label: t`Board visibility`,
+          kan: true,
+          trello: true,
+        },
+        {
+          key: "search",
+          label: t`Intelligent search`,
+          kan: true,
+          trello: true,
+        },
+        {
+          key: "workspace-url",
+          label: t`Custom workspace link`,
+          kan: true,
+          trello: false,
+        },
+      ],
    },
    {
-      name: t`Collaboration`,
-      features: collaborationFeatures,
-    },
-    {
-      name: t`Imports`,
-      features: importsFeatures,
+      name: t`Teams`,
+      features: [
+        {
+          key: "pricing",
+          label: t`Price per user/month`,
+          kan: frequencyValue === "monthly" ? `$10.00` : `$8.00`,
+          trello: frequencyValue === "monthly" ? `$12.00` : `$10.00`,
+        },
+        {
+          key: "comments",
+          label: t`Comments & mentions`,
+          kan: true,
+          trello: true,
+        },
+        {
+          key: "assignments",
+          label: t`Assignees`,
+          kan: true,
+          trello: true,
+        },
+        {
+          key: "sharing",
+          label: t`Board sharing & invites`,
+          kan: true,
+          trello: true,
+        },
+        {
+          key: "invite-links",
+          label: t`Invite links`,
+          kan: true,
+          trello: true,
+        },
+      ],
    },
    {
      name: t`Platform`,
-      features: platformFeatures,
-    },
-    {
-      name: t`Security`,
-      features: securityFeatures,
-    },
-    {
-      name: t`Support`,
-      features: supportFeatures,
+      features: [
+        {
+          key: "api",
+          label: t`REST API`,
+          kan: true,
+          trello: true,
+        },
+        {
+          key: "open-source",
+          label: t`Open source`,
+          kan: true,
+          trello: false,
+        },
+        {
+          key: "self-hostable",
+          label: t`Self-hostable`,
+          kan: true,
+          trello: false,
+        },
+        {
+          key: "white-label",
+          label: t`White label`,
+          kan: true,
+          trello: false,
+        },
+        {
+          key: "performance",
+          label: t`Fast & lightweight`,
+          kan: true,
+          trello: false,
+        },
+        {
+          key: "this-is-a-joke",
+          label: t`Owned by Atlassian`,
+          kan: false,
+          trello: true,
+        },
+      ],
    },
  ];

-  const plans = [
-    { id: "free", name: t`Free`, tierId: "tier-free" },
-    { id: "teams", name: t`Teams`, tierId: "tier-teams" },
-    { id: "pro", name: t`Pro`, tierId: "tier-pro" },
-    { id: "enterprise", name: t`Enterprise`, tierId: "tier-enterprise" },
+  const products = [
+    {
+      id: "kan",
+      name: t`Kan`,
+      featured: true,
+    },
+    {
+      id: "trello",
+      name: t`Trello`,
+      featured: false,
+    },
  ];

-  const isHighlightValue = (
-    value: string | boolean | { text: string; highlight?: string },
-  ): value is { text: string; highlight?: string } => {
-    return typeof value === "object" && value !== null && "text" in value;
-  };
-
-  const shouldHighlight = (text: string): boolean => {
-    const lowerText = text.toLowerCase();
-    return ["unlimited", "multiple", "per-seat", "custom", "mentions", "full", "sso", "admin"].some(
-      (keyword) => lowerText.includes(keyword),
-    );
-  };
-
-  const CellValue = ({
-    value,
-    label,
-  }: {
-    value: string | boolean | { text: string; highlight?: string };
-    label: string;
-  }) => {
-    // Handle object with text and highlight
-    if (isHighlightValue(value)) {
-      const { text, highlight } = value;
-      const isUnlimited = shouldHighlight(text);
-      
-      let displayText;
-      if (highlight) {
-        const parts = text.split(new RegExp(`(${highlight})`, "gi"));
-        displayText = (
-          <>
-            {parts.map((part, index) =>
-              part.toLowerCase() === highlight.toLowerCase() ? (
-                <span key={index} className="text-light-1000 dark:text-dark-1000">
-                  {part}
-                </span>
-              ) : (
-                <span key={index} className="text-light-950 dark:text-dark-800">
-                  {part}
-                </span>
-              ),
-            )}
-          </>
-        );
-      } else {
-        displayText = text;
-      }
-      
-      return (
-        <div className="flex items-center gap-2.5">
-          <HiCheckCircle
-            className={twMerge(
-              "mt-0.5 h-4 w-4 shrink-0",
-              isUnlimited
-                ? "text-light-1000 dark:text-dark-1000"
-                : "text-light-400 dark:text-dark-600",
-            )}
-          />
-          <span
-            className={twMerge(
-              "text-sm font-medium",
-              isUnlimited
-                ? "text-light-1000 dark:text-dark-950"
-                : "text-light-950 dark:text-dark-800",
-            )}
-          >
-            {displayText}
-          </span>
-        </div>
-      );
-    }
-    
-    if (typeof value === "string") {
-      const isUnlimited = shouldHighlight(value);
-      return (
-        <div className="flex items-center gap-2.5">
-          <HiCheckCircle
-            className={twMerge(
-              "mt-0.5 h-4 w-4 shrink-0",
-              isUnlimited
-                ? "text-light-1000 dark:text-dark-1000"
-                : "text-light-400 dark:text-dark-600",
-            )}
-          />
-          <span
-            className={twMerge(
-              "text-sm font-medium",
-              isUnlimited
-                ? "text-light-1000 dark:text-dark-950"
-                : "text-light-950 dark:text-dark-800",
-            )}
-          >
-            {value}
-          </span>
-        </div>
-      );
-    }
-    if (value) {
-      // Boolean true - show checkmark icon
-      return (
-        <div className="flex items-center gap-2.5">
-          <HiCheckCircle className="mt-0.5 h-4 w-4 shrink-0 text-light-1000 dark:text-dark-1000" />
-          <span className="text-sm font-medium text-light-1000 dark:text-dark-950">
-            {label}
-          </span>
-        </div>
-      );
-    }
-    // Boolean false - show cross icon
-    return (
-      <div className="flex items-center gap-2.5">
-        <HiXCircle className="mt-0.5 h-4 w-4 shrink-0 text-light-400 dark:text-dark-600" />
-        <span className="text-sm font-medium text-light-800 dark:text-dark-800">
-          {label}
-        </span>
-      </div>
-    );
-  };
-
-  const getFeatureValue = (
-    feature: PlanFeature,
-    planId: string,
-  ): string | boolean | { text: string; highlight?: string } => {
-    switch (planId) {
-      case "free":
-        return feature.free;
-      case "teams":
-        return feature.teams;
-      case "pro":
-        return feature.pro;
-      case "enterprise":
-        return feature.enterprise;
-      default:
-        return false;
-    }
-  };
-
  return (
-    <section aria-labelledby="comparison-heading" className="w-full">
-      <div className="mx-auto max-w-7xl">
-        <div
-          ref={containerRef}
-          className="relative overflow-x-auto rounded-lg border border-light-300 bg-light-50 dark:border-dark-300 dark:bg-dark-50"
-        >
-          {isHeaderFixed && (
-            <div
-              className="hidden sm:block fixed z-40 border-b border-light-300 bg-light-50/95 dark:border-dark-400 dark:bg-dark-50/95"
-              style={{
-                top: 64,
-                left: headerRect.left,
-                width: headerRect.width,
-              }}
-            >
-              <div className="grid grid-cols-4 border-x border-light-300 dark:border-dark-300">
-                {plans.map((plan) => {
-                  const isMostPopular = plan.id === "pro";
-                  return (
-                    <div
-                      key={`fixed-${plan.id}`}
-                      className={twMerge(
-                        "flex items-center px-6 py-3 text-left text-base font-semibold",
-                        isMostPopular
-                          ? "bg-light-200 text-light-1000 dark:bg-dark-100 dark:text-dark-1000"
-                          : "bg-light-50 text-dark-50 dark:bg-dark-50 dark:text-dark-1000",
-                      )}
-                    >
-                      {plan.name}
-                      {plan.id === "pro" && <span className="ml-1 text-xl">∞</span>}
-                    </div>
-                  );
-                })}
+    <section aria-labelledby="comparison-heading" className="w-full px-4">
+      <div className="mx-auto max-w-6xl py-8 lg:py-10">
+        <div className="grid grid-cols-3 gap-x-8 border-t border-light-500 before:block dark:border-dark-300">
+          {products.map((product) => (
+            <div key={product.id} aria-hidden="true" className="-mt-px">
+              <div
+                className={`${product.featured ? "border-dark-200 dark:border-dark-800" : "border-transparent"} border-t-2 pt-8`}
+              >
+                <p
+                  className={`${product.featured ? "text-dark-50 dark:text-dark-1000" : "text-light-1000 dark:text-dark-1000"} text-center text-sm font-semibold`}
+                >
+                  {product.name}
+                </p>
              </div>
            </div>
-          )}
-          <table className="w-full border-separate border-spacing-0">
-            <thead>
-              <tr>
-                {plans.map((plan) => {
-                  const isMostPopular = plan.id === "pro";
-                  return (
-                    <th
-                      key={plan.id}
-                      scope="col"
-                      className={twMerge(
-                        "w-1/4 px-6 py-4 text-left text-base font-semibold",
-                        isMostPopular
-                          ? "bg-light-200 text-light-1000 dark:bg-dark-100 dark:text-dark-1000"
-                          : "bg-light-50 text-dark-50 dark:bg-dark-50 dark:text-dark-1000",
-                      )}
-                    >
-                      <span className="flex items-center">
-                        {plan.name}
-                        {plan.id === "pro" && <span className="ml-1 text-xl">∞</span>}
-                      </span>
-                    </th>
-                  );
-                })}
-              </tr>
-            </thead>
-            <tbody>
-              {sections.map((section, sectionIdx) => (
-                <React.Fragment key={section.name || `section-${sectionIdx}`}>
-                  {section.name && (
-                    <tr>
-                      {plans.map((plan) => {
-                        const isPro = plan.id === "pro";
-                        return (
-                          <td
-                            key={plan.id}
-                            className={twMerge(
-                              "border-t px-6 py-3 text-left text-sm font-semibold text-dark-900 dark:text-dark-900",
-                              isPro
-                                ? "border-light-400 bg-light-200 dark:border-dark-400 dark:bg-dark-100"
-                                : "border-light-300 bg-light-50 dark:border-dark-400 dark:bg-dark-50",
-                            )}
-                          >
-                            {plan.id === "free" ? section.name : ""}
-                          </td>
-                        );
-                      })}
-                    </tr>
-                  )}
-                  {section.features.map((feature) => (
-                    <tr key={feature.key}>
-                      {plans.map((plan) => {
-                        const isPro = plan.id === "pro";
-                        return (
-                          <td
-                            key={plan.id}
-                            className={twMerge(
-                              "w-1/4 border-t px-6 py-3 text-left",
-                              isPro
-                                ? "border-light-400 bg-light-200 dark:border-dark-400 dark:bg-dark-100"
-                                : "border-light-300 dark:border-dark-400",
-                            )}
-                          >
-                            <CellValue
-                              value={getFeatureValue(feature, plan.id)}
-                              label={feature.label}
-                            />
-                          </td>
-                        );
-                      })}
-                    </tr>
+          ))}
+        </div>
+
+        <div className="-mt-6 space-y-12">
+          {sections.map((section) => (
+            <div key={section.name}>
+              <h4 className="text-sm font-semibold text-light-1000 dark:text-dark-1000">
+                {section.name}
+              </h4>
+              <div className="relative -mx-8 mt-8">
+                <div
+                  aria-hidden="true"
+                  className="absolute inset-x-8 inset-y-0 grid grid-cols-3 gap-x-8 before:block"
+                >
+                  {products.map((product) => (
+                    <div
+                      key={product.id}
+                      className={`size-full rounded-lg ${product.featured ? "bg-white shadow-sm dark:bg-dark-50 dark:shadow-none" : ""}`}
+                    />
                  ))}
-                </React.Fragment>
-              ))}
-            </tbody>
-          </table>
+                </div>
+
+                <table className="relative w-full border-separate border-spacing-x-8">
+                  <thead>
+                    <tr className="text-left">
+                      <th scope="col">
+                        <span className="sr-only">{t`Feature`}</span>
+                      </th>
+                      {products.map((p) => (
+                        <th key={p.id} scope="col">
+                          <span className="sr-only">{p.name}</span>
+                        </th>
+                      ))}
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {section.features.map((feature, featureIdx) => (
+                      <tr key={feature.key}>
+                        <th
+                          scope="row"
+                          className="w-1/3 py-3 pr-4 text-left text-sm font-normal text-light-1000 dark:text-dark-1000"
+                        >
+                          {feature.label}
+                          {featureIdx !== section.features.length - 1 ? (
+                            <div className="absolute inset-x-8 mt-3 h-px bg-light-500 dark:bg-dark-300" />
+                          ) : null}
+                        </th>
+                        {products.map((p) => (
+                          <td
+                            key={p.id}
+                            className="relative w-1/3 px-4 py-0 text-center"
+                          >
+                            <span className="relative inline-flex w-full items-center justify-center py-3">
+                              <CellValue
+                                value={
+                                  p.id === "kan" ? feature.kan : feature.trello
+                                }
+                              />
+                            </span>
+                          </td>
+                        ))}
+                      </tr>
+                    ))}
+                  </tbody>
+                </table>
+
+                <div
+                  aria-hidden="true"
+                  className="pointer-events-none absolute inset-x-8 inset-y-0 grid grid-cols-3 gap-x-8 before:block"
+                >
+                  {products.map((product) => (
+                    <div
+                      key={product.id}
+                      className={`${product.featured ? "ring-1 ring-light-500 dark:ring-dark-800" : "ring-0"} rounded-2xl`}
+                    />
+                  ))}
+                </div>
+              </div>
+            </div>
+          ))}
        </div>
      </div>
    </section>
--- a/apps/web/src/views/pricing/components/PricingTiers.tsx
+++ b/apps/web/src/views/pricing/components/PricingTiers.tsx
@@ -23,115 +23,81 @@ const Pricing = ({
 }) => {
  const tiers = [
    {
-      name: t`Free`,
-      id: "tier-free",
+      name: t`Individuals`,
+      id: "tier-individuals",
      href: "signup",
-      buttonText: t`Get started`,
-      price: { monthly: t`$0`, annually: t`$0` },
-      description: t`Free for everyone`,
-      bestFor: t`Best for individuals and solo creators getting started`,
-      featureHeader: undefined,
+      buttonText: t`Get Started`,
+      price: { monthly: t`Free`, annually: t`Free` },
+      description: t`Everything you need, free forever. Unlimited boards, unlimited lists, unlimited cards. Upgrade any time.`,
+      featureHeader: t`Free, forever`,
      features: [
-        { text: t`1 user` },
-        { text: t`Unlimited boards` },
-        { text: t`Unlimited cards` },
-        { text: t`Custom board templates` },
-        { text: t`Checklists` },
+        t`1 user`,
+        t`Unlimited boards`,
+        t`Unlimited cards`,
+        t`Custom board templates`,
+        t`Checklists`,
      ],
      showPrice: true,
-      ctaSubtext: undefined,
-      mostPopular: false,
-      highlighted: false,
    },
    {
      name: t`Teams`,
      id: "tier-teams",
      href: "signup",
-      buttonText: t`Get started`,
-      price: { monthly: "$10", annually: "$8" },
-      description: t`Perfect for small and growing teams looking to collaborate.`,
-      bestFor: t`Best for small and growing teams that need collaboration`,
-      featureHeader: undefined,
+      buttonText: t`Get Started`,
+      price: { monthly: "$10.00", annually: "$8.00" },
+      description: t`Kan is better with a team. Perfect for small and growing teams looking to collaborate.`,
+      featureHeader: t`Everything in the free plan, plus:`,
      features: [
-        { text: t`All Free features +` },
-        { text: t`Workspace members` },
-        { text: t`Invite links` },
-        { text: t`Unlimited file uploads` },
-        { text: t`Email notifications for mentions` },
-        { text: t`Priority email support` },
-      ],
-      highlighted: false,
-      showPrice: true,
-      showPriceSuffix: true,
-      ctaSubtext: t`14 day free trial · Switch plans or cancel anytime`,
-      mostPopular: false,
-    },
-    {
-      name: t`Pro`,
-      id: "tier-pro",
-      href: "signup",
-      buttonText: t`Get started`,
-      price: { monthly: "$29", annually: "$24" },
-      description: t`Unlimited seats and advanced features for growing teams.`,
-      bestFor: t`Best for teams that want to scale without limits`,
-      featureHeader: undefined,
-      features: [
-        { text: t`All Teams features +` },
-        { text: t`Unlimited members` },
-        { text: t`Custom workspace username` },
-        { text: t`Configurable user roles and permissions` },
-        { text: t`Custom branding` },
+        t`Workspace members`,
+        t`Admin roles`,
+        t`Priority email support`,
+        t`Support the development of the project`,
      ],
      highlighted: true,
      showPrice: true,
-      showPriceSuffix: false,
-      ctaSubtext: t`14 day free trial · Switch plans or cancel anytime`,
-      mostPopular: true,
+      showPriceSuffix: true,
    },
    {
-      name: t`Enterprise`,
-      id: "tier-enterprise",
-      href: "mailto:support@kan.bn?subject=Enterprise Inquiry",
-      buttonText: t`Contact Sales`,
-      price: { monthly: t`Contact us`, annually: t`Contact us` },
-      description: t`Advanced security, compliance, and dedicated support for large organizations.`,
-      bestFor: t`Best for large organizations with advanced needs`,
-      featureHeader: undefined,
+      name: t`Self Host`,
+      id: "tier-self-host",
+      href: "https://github.com/kanbn/kan",
+      buttonText: t`View docs`,
+      price: { monthly: "-", annually: "-" },
+      description: t`Host Kan on your own infrastructure. Ideal for organisations that need complete control over their data.`,
+      featureHeader: t`Complete control and ownership:`,
      features: [
-        { text: t`All Pro features +` },
-        { text: t`SAML SSO` },
-        { text: t`Advanced admin controls` },
-        { text: t`Dedicated account manager` },
-        { text: t`Custom SLA` },
-        { text: t`On-premise deployment option` },
+        t`Run on your own infrastructure`,
+        t`Own your data`,
+        t`Custom domain`,
      ],
-      highlighted: false,
-      showPrice: true,
-      showPriceSuffix: false,
-      ctaSubtext: undefined,
      mostPopular: false,
+      showPrice: false,
    },
  ];

  return (
    <>
-      <div className="mx-auto max-w-7xl px-4">
-        <div className="mb-8 flex items-center justify-center">
+      <div className="flex flex-col items-center justify-center px-4 pb-10">
+        <div className="mt-14 flex flex-col items-center justify-center">
+          <div className="mb-8 flex items-center gap-2 rounded-full border bg-white px-4 py-1.5 text-center text-xs font-bold text-gray-800 dark:border-dark-300 dark:bg-dark-1000 dark:text-gray-800 lg:text-sm">
+            <HiBolt />
+            <p>{t`Launch offer: unlimited seats for just $29/month with Pro`}</p>
+          </div>
          <fieldset aria-label={t`Payment frequency`}>
            <RadioGroup
              value={frequency}
              onChange={(value) => setFrequency(value)}
-              className="flex gap-1 rounded-lg border border-light-300 bg-light-50 p-1 dark:border-dark-300 dark:bg-dark-50"
+              className="grid grid-cols-2 gap-x-1 rounded-full p-1 text-center text-xs/5 font-semibold ring-1 ring-inset ring-light-600 dark:ring-dark-600"
            >
              {frequencies.map((option) => (
                <Radio
                  key={option.value}
                  value={option}
                  className={twMerge(
-                    "cursor-pointer rounded-md px-4 py-1.5 text-sm font-medium transition-colors",
+                    "cursor-pointer rounded-full px-2.5 py-1 text-xs transition-colors lg:text-sm",
                    frequency?.value === option.value
-                      ? "bg-white text-light-1000 shadow-sm dark:bg-dark-100 dark:text-dark-1000"
-                      : "text-light-600 dark:text-dark-700",
+                      ? "bg-dark-50 text-white dark:bg-light-50 dark:text-dark-50"
+                      : "text-light-900 hover:bg-light-100 dark:hover:bg-dark-100",
                  )}
                >
                  {option.label}
@@ -140,129 +106,103 @@ const Pricing = ({
            </RadioGroup>
          </fieldset>
        </div>
+      </div>

-        <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4">
+      <div className="isolate mx-auto mb-10 grid max-w-md grid-cols-1 gap-8 px-4 lg:mx-0 lg:max-w-none lg:grid-cols-3">
        {tiers.map((tier) => (
          <div
            key={tier.id}
            className={twMerge(
-              "relative flex h-full flex-col rounded-lg border p-6",
-              tier.mostPopular
-                ? "border-light-400 bg-light-200 dark:border-dark-400 dark:bg-dark-100"
-                : "border-light-300 bg-light-50 dark:border-dark-300 dark:bg-dark-50",
+              tier.highlighted
+                ? "bg-dark-50 ring-1 ring-dark-50 dark:ring-dark-800"
+                : "bg-light-50 ring-1 ring-light-300 dark:bg-dark-50 dark:ring-dark-300",
+              "rounded-3xl p-8 xl:p-10",
            )}
          >
-            {tier.id === "tier-pro" && (
-              <div className="absolute right-2 top-2 z-10">
-                <span className="inline-flex items-center gap-1 rounded-full border border-light-400 bg-light-100 px-3 py-1 text-center text-xs text-dark-600 dark:border-dark-400 dark:bg-dark-100 dark:text-dark-900">
-                  <HiBolt className="h-3 w-3 -ml-0.5" />
-                  {t`Launch offer`}
-                </span>
-              </div>
-            )}
-            <h3
-              id={tier.id}
+            <div className="flex items-center justify-between gap-x-4">
+              <h3
+                id={tier.id}
+                className={twMerge(
+                  tier.highlighted
+                    ? "text-dark-1000 dark:text-dark-1000"
+                    : "text-dark-50 dark:text-dark-1000",
+                  "text-lg/8 font-semibold",
+                )}
+              >
+                {tier.name}
+              </h3>
+              {tier.highlighted && (
+                <p className="rounded-full bg-light-50 px-2.5 py-1 text-[12px] font-semibold text-dark-500 dark:bg-dark-1000 dark:text-dark-50">
+                  {t`14 day free trial`}
+                </p>
+              )}
+            </div>
+            <p
              className={twMerge(
-                "mb-4 flex items-center text-base font-semibold",
-                tier.mostPopular
-                  ? "text-light-1000 dark:text-dark-1000"
-                  : "text-light-1000 dark:text-dark-1000",
+                "mt-4 text-sm/6 text-dark-950 dark:text-dark-900",
+                tier.highlighted ? "text-light-100" : "text-dark-50",
              )}
            >
-              {tier.name}
-              {tier.id === "tier-pro" && <span className="ml-1 text-xl leading-none">∞</span>}
-            </h3>
-            <div className="mb-4">
-              <p className="flex items-baseline gap-x-1">
-                <span
-                  className={twMerge(
-                    "text-2xl font-semibold",
-                    tier.mostPopular
-                      ? "text-light-1000 dark:text-dark-1000"
-                      : "text-light-1000 dark:text-dark-1000",
-                    !tier.showPrice && "opacity-0",
-                  )}
-                >
-                  {tier.price[frequency?.value ?? "monthly"]}
+              {tier.description}
+            </p>
+            <p className="mt-6 flex items-baseline gap-x-1">
+              <span
+                className={twMerge(
+                  "text-3xl font-semibold tracking-tight text-light-100",
+                  tier.highlighted
+                    ? "text-light-50 dark:text-dark-1000"
+                    : "text-gray-900 dark:text-dark-1000",
+                  !tier.showPrice && "opacity-0",
+                )}
+              >
+                {tier.price[frequency?.value ?? "monthly"]}
+              </span>
+              {tier.showPriceSuffix && (
+                <span className="text-sm/6 font-semibold text-light-50 dark:text-dark-900">
+                  {frequency?.priceSuffix}
                </span>
-                {tier.id === "tier-pro" && (
-                  <span
-                    className={twMerge(
-                      "text-2xl font-semibold line-through",
-                      tier.mostPopular
-                        ? "text-light-600 dark:text-dark-600"
-                        : "text-light-600 dark:text-dark-600",
-                    )}
-                  >
-                    {frequency?.value === "annually" ? "$79" : "$100"}
-                  </span>
-                )}
-                {tier.showPriceSuffix && (
-                  <span className="text-sm font-normal text-dark-400 dark:text-dark-700">
-                    {frequency?.priceSuffix}
-                  </span>
-                )}
-                {tier.id === "tier-pro" && (
-                  <span className="text-sm font-normal text-dark-400 dark:text-dark-700">
-                    {t`/month`}
-                  </span>
-                )}
-              </p>
-            </div>
-            {tier.bestFor && (
-              <p className="mb-6 text-sm text-dark-400 dark:text-dark-700">
-                {tier.bestFor}
-              </p>
-            )}
-            <div className="mb-6">
-              {tier.id === "tier-enterprise" ? (
-                <a
-                  href={tier.href}
-                  aria-describedby={tier.id}
-                  className="block w-full rounded-md border border-dark-200 bg-transparent px-4 py-2 text-center text-sm font-medium text-dark-50 transition-colors hover:bg-dark-50 hover:text-light-50 dark:border-dark-300 dark:text-dark-1000 dark:hover:bg-dark-200"
-                >
-                  {tier.buttonText}
-                </a>
-              ) : (
-                <>
-                  <Link
-                    href={tier.href}
-                    aria-describedby={tier.id}
-                    className={twMerge(
-                      "block w-full rounded-md px-4 py-2 text-center text-sm font-medium transition-colors",
-                      tier.mostPopular
-                        ? "bg-dark-50 text-light-50 shadow-sm hover:bg-dark-100 dark:bg-dark-1000 dark:text-dark-50 dark:hover:bg-dark-900"
-                        : "border border-dark-200 bg-transparent text-dark-50 transition-colors hover:bg-dark-50 hover:text-light-50 dark:border-dark-300 dark:text-dark-1000 dark:hover:bg-dark-200",
-                    )}
-                  >
-                    {tier.buttonText}
-                  </Link>
-                </>
              )}
-            </div>
-            <ul role="list" className="space-y-2.5">
-              {tier.features.map((feature, index) => (
-                <li
-                  key={`${tier.id}-feature-${index}`}
-                  className="flex items-start gap-x-2.5"
-                >
-                  <HiCheckCircle
-                    className="mt-0.5 h-4 w-4 shrink-0 text-light-1000 dark:text-dark-1000"
-                  />
-                  <span className="text-sm text-dark-600 dark:text-dark-800">
-                    {feature.text}
-                  </span>
+            </p>
+            <Link
+              href={tier.href}
+              aria-describedby={tier.id}
+              className={twMerge(
+                tier.highlighted
+                  ? "bg-light-50 text-dark-50 shadow-sm dark:bg-dark-1000 dark:text-dark-50"
+                  : "bg-dark-50 text-light-50 dark:bg-dark-200 dark:text-dark-1000",
+                "mt-6 block rounded-md px-3 py-2 text-center text-sm/6 font-semibold focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600",
+              )}
+            >
+              {tier.buttonText}
+            </Link>
+            <p
+              className={twMerge(
+                "mt-8 text-sm/6 font-bold",
+                tier.highlighted
+                  ? "text-light-100 dark:text-dark-1000"
+                  : "text-dark-50 dark:text-dark-1000",
+              )}
+            >
+              {tier.featureHeader}
+            </p>
+            <ul
+              role="list"
+              className={twMerge(
+                "mt-2 space-y-3 text-sm/6 text-light-600",
+                tier.highlighted
+                  ? "text-light-100 dark:text-dark-1000"
+                  : "text-dark-50 dark:text-dark-1000",
+              )}
+            >
+              {tier.features.map((feature) => (
+                <li key={feature} className="flex items-center gap-x-3">
+                  <HiCheckCircle className="h-5 w-5" />
+                  {feature}
                </li>
              ))}
            </ul>
          </div>
        ))}
-        </div>
-        <div className="mx-auto mt-8 max-w-3xl px-4 text-center">
-          <div className="inline-flex items-center gap-2 rounded-full border bg-light-50 px-4 py-1 text-center text-xs text-light-1000 dark:border-dark-300 dark:bg-dark-50 dark:text-dark-900">
-            <p>{t`14 day free trial · Switch plans or cancel anytime`}</p>
-          </div>
-        </div>
      </div>
    </>
  );
--- a/apps/web/src/views/pricing/index.tsx
+++ b/apps/web/src/views/pricing/index.tsx
@@ -43,8 +43,8 @@ export default function PricingView() {
            <p className="mt-4 text-center text-3xl font-bold text-light-1000 dark:text-dark-1000 lg:text-5xl">
              {t`Simple pricing`}
            </p>
-            <p className="text:md lg:text-md mt-6 max-w-[300px] text-center text-light-950 dark:text-dark-900">
-              {t`Start free. Upgrade as your team grows. No hidden fees, no contracts.`}
+            <p className="text:md lg:text-md mt-6 max-w-[500px] text-center text-light-950 dark:text-dark-900">
+              {t`Get started for free, with no usage limits. For collaboration, upgrade to a plan that fits the size of your team.`}
            </p>
          </div>
          <PricingTiers
@@ -59,9 +59,23 @@ export default function PricingView() {
        </div>

        <div className="pb-22 flex flex-col items-center justify-center px-4">
-        
+          <div className="flex items-center gap-2 rounded-full border bg-light-50 px-4 py-1 text-center text-xs text-light-1000 dark:border-dark-300 dark:bg-dark-50 dark:text-dark-900 lg:text-sm">
+            <p>{t`Features`}</p>
+          </div>

-          <div className="mt-10 w-full">
+          <p className="mt-4 text-center text-3xl font-bold text-light-1000 dark:text-dark-1000 lg:text-4xl">
+            {t`Feature breakdown`}
+          </p>
+          <p className="text-md lg:text-md my-4 max-w-[500px] text-center text-light-950 dark:text-dark-900">
+            {t`Compare our features to see why Kan is the best choice.`}
+          </p>
+          <div className="mt-2">
+            <Button variant="primary" href="/signup">
+              {t`Get started`}
+            </Button>
+          </div>
+
+          <div className="mt-10 w-full max-w-[900px]">
            <FeatureComparisonTable
              frequencyValue={frequency?.value ?? "annually"}
            />
--- a/apps/web/src/views/public/board/CardModal.tsx
+++ b/apps/web/src/views/public/board/CardModal.tsx
@@ -1,13 +1,12 @@
 import { useRouter } from "next/router";
 import { t } from "@lingui/core/macro";
 import { useEffect, useRef, useState } from "react";
-import { HiLink, HiXMark } from "react-icons/hi2";
+import { HiXMark } from "react-icons/hi2";

 import Badge from "~/components/Badge";
 import Editor from "~/components/Editor";
 import LabelIcon from "~/components/LabelIcon";
 import { useModal } from "~/providers/modal";
-import { usePopup } from "~/providers/popup";
 import { api } from "~/utils/api";
 import ActivityList from "~/views/card/components/ActivityList";
 import { AttachmentThumbnails } from "~/views/card/components/AttachmentThumbnails";
@@ -24,29 +23,10 @@ export function CardModal({
 }) {
  const router = useRouter();
  const { closeModal, isOpen } = useModal();
-  const { showPopup } = usePopup();
  const [showFade, setShowFade] = useState(false);
  const [showTopFade, setShowTopFade] = useState(false);
  const scrollRef = useRef<HTMLDivElement>(null);

-  const handleCopyCardLink = async () => {
-    try {
-      await navigator.clipboard.writeText(window.location.href);
-      showPopup({
-        header: t`Link copied`,
-        icon: "success",
-        message: t`Card URL copied to clipboard`,
-      });
-    } catch (error) {
-      console.error(error);
-      showPopup({
-        header: t`Unable to copy link`,
-        icon: "error",
-        message: t`Please try again.`,
-      });
-    }
-  };
-
  const { data, isLoading } = api.card.byId.useQuery(
    {
      cardPublicId: cardPublicId ?? "",
@@ -85,44 +65,33 @@ export function CardModal({
        <div className="h-full p-8">
          <div className="mb-6">
            <div className="flex w-full items-center justify-between">
-              <div className="absolute right-[2rem] top-[2rem] flex items-center gap-1">
-                <button
-                  type="button"
-                  onClick={handleCopyCardLink}
-                  className="rounded p-1.5 transition-all hover:bg-light-200 focus:outline-none dark:hover:bg-dark-100"
-                  aria-label="Copy card link"
-                >
-                  <HiLink className="h-4 w-4 text-light-900 dark:text-dark-900" />
-                </button>
-                <button
-                  type="button"
-                  className="rounded p-1.5 transition-all hover:bg-light-200 focus:outline-none dark:hover:bg-dark-100"
-                  onClick={(e) => {
-                    e.preventDefault();
-                    closeModal();
+              <button
+                className="absolute right-[2rem] top-[2rem] rounded p-1 hover:bg-light-300 focus:outline-none dark:hover:bg-dark-300"
+                onClick={(e) => {
+                  e.preventDefault();
+                  closeModal();

-                    setTimeout(() => {
-                      void router.replace(
-                        {
-                          pathname: router.pathname,
-                          query: {
-                            ...router.query,
-                            workspaceSlug: workspaceSlug ?? "",
-                            boardSlug: [boardSlug ?? ""],
-                          },
+                  setTimeout(() => {
+                    void router.replace(
+                      {
+                        pathname: router.pathname,
+                        query: {
+                          ...router.query,
+                          workspaceSlug,
+                          boardSlug: [boardSlug],
                        },
-                        undefined,
-                        { shallow: true },
-                      );
-                    }, 400);
-                  }}
-                >
-                  <HiXMark
-                    size={18}
-                    className="text-light-900 dark:text-dark-900"
-                  />
-                </button>
-              </div>
+                      },
+                      undefined,
+                      { shallow: true },
+                    );
+                  }, 400);
+                }}
+              >
+                <HiXMark
+                  size={18}
+                  className="dark:text-dark-9000 text-light-900"
+                />
+              </button>
              {isLoading ? (
                <div className="flex space-x-2">
                  <div className="h-[2.3rem] w-[300px] animate-pulse rounded-[5px] bg-light-300 dark:bg-dark-300" />
--- a/apps/web/src/views/public/board/index.tsx
+++ b/apps/web/src/views/public/board/index.tsx
@@ -30,7 +30,7 @@ export default function PublicBoardView() {
  const { showPopup } = usePopup();
  const [isRouteLoaded, setIsRouteLoaded] = useState(false);
  const { openModal } = useModal();
-
+  
  const { ref: scrollRef, onMouseDown } = useDragToScroll({
    enabled: true,
    direction: "horizontal",
@@ -70,34 +70,29 @@ export default function PublicBoardView() {
    },
  );

-  const handleCopyBoardLink = async () => {
-    try {
-      await navigator.clipboard.writeText(window.location.href);
-      showPopup({
-        header: t`Link copied`,
-        icon: "success",
-        message: t`Board URL copied to clipboard`,
-      });
-    } catch (error) {
-      console.error(error);
-      showPopup({
-        header: t`Unable to copy link`,
-        icon: "error",
-        message: t`Please try again.`,
-      });
-    }
-  };
+  const CopyBoardLink = () => {
+    return (
+      <button
+        onClick={async () => {
+          try {
+            await navigator.clipboard.writeText(window.location.href);
+          } catch (error) {
+            console.error(error);
+          }

-  const CopyBoardLink = () => (
-    <button
-      type="button"
-      onClick={handleCopyBoardLink}
-      className="rounded p-1.5 transition-all hover:bg-light-200 focus:outline-none dark:hover:bg-dark-100"
-      aria-label="Copy board URL"
-    >
-      <HiLink className="h-4 w-4 text-light-900 dark:text-dark-900" />
-    </button>
-  );
+          showPopup({
+            header: t`Link copied`,
+            icon: "success",
+            message: t`Board URL copied to clipboard`,
+          });
+        }}
+        className="rounded p-1.5 transition-all hover:bg-light-200 dark:hover:bg-dark-100"
+        aria-label={`Copy board URL`}
+      >
+        <HiLink className={`h-4 w-4 text-light-900 dark:text-dark-900`} />
+      </button>
+    );
+  };

  const pathWithoutQuery = router.asPath.split("?")[0];
  const splitPath = pathWithoutQuery?.split("/") ?? [];
--- a/apps/web/src/views/settings/components/UpdateWorkspaceUrlForm.tsx
+++ b/apps/web/src/views/settings/components/UpdateWorkspaceUrlForm.tsx
@@ -33,7 +33,7 @@ const UpdateWorkspaceUrlForm = ({
      .min(3, {
        message: t`URL must be at least 3 characters long`,
      })
-      .max(64, { message: t`URL cannot exceed 64 characters` })
+      .max(24, { message: t`URL cannot exceed 24 characters` })
      .regex(/^(?![-]+$)[a-zA-Z0-9-]+$/, {
        message: t`URL can only contain letters, numbers, and hyphens`,
      }),
--- a/cloud/docker-compose.yml
+++ b/cloud/docker-compose.yml
@@ -1,17 +1,4 @@
 services:
-  migrator:
-    image: ghcr.io/kanbn/kan-migrate:latest
-    container_name: ${MIGRATOR_CONTAINER_NAME:-kan-migrate}
-    build:
-      context: ..
-      dockerfile: apps/web/Dockerfile
-      target: migrate
-    networks:
-      - dokploy-network
-    environment:
-      - POSTGRES_URL=${POSTGRES_URL}
-    restart: "no"
-
  web:
    image: ghcr.io/kanbn/kan:latest
    container_name: ${CONTAINER_NAME:-kan-web}
@@ -22,7 +9,6 @@ services:
    build:
      context: ..
      dockerfile: apps/web/Dockerfile
-      target: web
      args:
        APP_VERSION: ${APP_VERSION:-}
    env_file:
@@ -93,9 +79,6 @@ services:
      - NEXT_PUBLIC_UMAMI_ID=${NEXT_PUBLIC_UMAMI_ID}
      - NEXT_PUBLIC_POSTHOG_KEY=${NEXT_PUBLIC_POSTHOG_KEY}
      - NEXT_PUBLIC_POSTHOG_HOST=${NEXT_PUBLIC_POSTHOG_HOST}
-    depends_on:
-      migrator:
-        condition: service_completed_successfully

 networks:
  dokploy-network:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,20 +1,4 @@
 services:
-  migrate:
-    image: ghcr.io/kanbn/kan-migrate:latest
-    container_name: ${CONTAINER_NAME:-kan-migrate}
-    networks:
-      - kan-network
-    build:
-      context: .
-      dockerfile: ./apps/web/Dockerfile
-      target: migrate
-    environment:
-      - POSTGRES_URL=${POSTGRES_URL}
-    depends_on:
-      postgres:
-        condition: service_healthy
-    restart: "no"
-
  web:
    image: ghcr.io/kanbn/kan:latest
    container_name: ${CONTAINER_NAME:-kan-web}
@@ -22,10 +6,10 @@ services:
      - "${WEB_PORT:-3000}:3000"
    networks:
      - kan-network
+      - dokploy-network
    build:
      context: .
-      dockerfile: ./apps/web/Dockerfile
-      target: web
+      dockerfile: ./apps/web/Dockerfile.new
    env_file:
      - .env
    environment:
@@ -123,8 +107,7 @@ services:
      - APPLE_CLIENT_SECRET=${APPLE_CLIENT_SECRET}
      - APPLE_APP_BUNDLE_IDENTIFIER=${APPLE_APP_BUNDLE_IDENTIFIER}
    depends_on:
-      migrate:
-        condition: service_completed_successfully
+      - postgres
    restart: unless-stopped

  postgres:
@@ -138,17 +121,14 @@ services:
      - 5432:5432
    volumes:
      - kan_postgres_data:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U kan -d kan_db"]
-      interval: 5s
-      timeout: 5s
-      retries: 10
    restart: unless-stopped
    networks:
      - kan-network

 networks:
  kan-network:
+  dokploy-network:
+    external: true

 volumes:
  kan_postgres_data:
--- a/packages/api/src/routers/attachment.ts
+++ b/packages/api/src/routers/attachment.ts
@@ -142,18 +142,9 @@ export const attachmentRouter = createTRPCRouter({
        createdBy: userId,
      });

-      if (!attachment) {
-        throw new TRPCError({
-          message: "Failed to create attachment",
-          code: "INTERNAL_SERVER_ERROR",
-        });
-      }
-
      await cardActivityRepo.create(ctx.db, {
        type: "card.updated.attachment.added",
        cardId: card.id,
-        attachmentId: attachment.id,
-        toTitle: input.originalFilename,
        createdBy: userId,
      });

@@ -215,8 +206,6 @@ export const attachmentRouter = createTRPCRouter({
      await cardActivityRepo.create(ctx.db, {
        type: "card.updated.attachment.removed",
        cardId: attachment.cardId,
-        attachmentId: attachment.id,
-        fromTitle: attachment.originalFilename,
        createdBy: userId,
      });

--- a/packages/api/src/routers/board.ts
+++ b/packages/api/src/routers/board.ts
@@ -143,13 +143,6 @@ export const boardRouter = createTRPCRouter({
        },
      );

-      if (!result) {
-        throw new TRPCError({
-          message: `Board with public ID ${input.boardPublicId} not found`,
-          code: "NOT_FOUND",
-        });
-      }
-
      // Generate presigned URLs for workspace member avatars
      const workspaceWithAvatarUrls = result.workspace
        ? {
@@ -173,31 +166,8 @@ export const boardRouter = createTRPCRouter({
          }
        : result.workspace;

-      // Generate presigned URLs for card member avatars
-      const listsWithAvatarUrls = await Promise.all(
-        result.lists.map(async (list) => ({
-          ...list,
-          cards: await Promise.all(
-            list.cards.map(async (card) => ({
-              ...card,
-              members: await Promise.all(
-                card.members.map(async (member) => {
-                  if (!member.user?.image) return member;
-                  const avatarUrl = await generateAvatarUrl(member.user.image);
-                  return {
-                    ...member,
-                    user: { ...member.user, image: avatarUrl },
-                  };
-                }),
-              ),
-            })),
-          ),
-        })),
-      );
-
      return {
        ...result,
-        lists: listsWithAvatarUrls,
        workspace: workspaceWithAvatarUrls,
      };
    }),
@@ -218,7 +188,7 @@ export const boardRouter = createTRPCRouter({
        workspaceSlug: z
          .string()
          .min(3)
-          .max(64)
+          .max(24)
          .regex(/^(?![-]+$)[a-zA-Z0-9-]+$/),
        boardSlug: z
          .string()
--- a/packages/api/src/routers/card.ts
+++ b/packages/api/src/routers/card.ts
@@ -10,7 +10,6 @@ import * as workspaceRepo from "@kan/db/repository/workspace.repo";

 import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc";
 import { mergeActivities } from "../utils/activities";
-import { sendMentionEmails } from "../utils/notifications";
 import { assertCanDelete, assertCanEdit, assertPermission } from "../utils/permissions";
 import { generateAttachmentUrl, generateAvatarUrl } from "@kan/shared/utils";

@@ -154,17 +153,6 @@ export const cardRouter = createTRPCRouter({
        await cardActivityRepo.bulkCreate(ctx.db, cardActivitesInsert);
      }

-      if (input.description) {
-        sendMentionEmails({
-          db: ctx.db,
-          cardPublicId: newCard.publicId,
-          commentHtml: input.description,
-          commenterUserId: userId,
-        }).catch((error) => {
-          console.error("Failed to send mention emails:", error);
-        });
-      }
-
      return newCard;
    }),
  addComment: protectedProcedure
@@ -227,16 +215,6 @@ export const cardRouter = createTRPCRouter({
        createdBy: userId,
      });

-      sendMentionEmails({
-        db: ctx.db,
-        cardPublicId: input.cardPublicId,
-        commentHtml: input.comment,
-        commenterUserId: userId,
-        commentId: newComment.id,
-      }).catch((error) => {
-        console.error("Failed to send mention emails:", error);
-      });
-
      return newComment;
    }),
  updateComment: protectedProcedure
@@ -317,16 +295,6 @@ export const cardRouter = createTRPCRouter({
        createdBy: userId,
      });

-      sendMentionEmails({
-        db: ctx.db,
-        cardPublicId: input.cardPublicId,
-        commentHtml: input.comment,
-        commenterUserId: userId,
-        commentId: updatedComment.id,
-      }).catch((error) => {
-        console.error("Failed to send mention emails:", error);
-      });
-
      return updatedComment;
    }),
  deleteComment: protectedProcedure
@@ -956,15 +924,6 @@ export const cardRouter = createTRPCRouter({
          fromDescription: existingCard.description ?? undefined,
          toDescription: input.description,
        });
-
-        sendMentionEmails({
-          db: ctx.db,
-          cardPublicId: input.cardPublicId,
-          commentHtml: input.description,
-          commenterUserId: userId,
-        }).catch((error) => {
-          console.error("Failed to send mention emails:", error);
-        });
      }

      if (
--- a/packages/api/src/routers/workspace.ts
+++ b/packages/api/src/routers/workspace.ts
@@ -160,7 +160,7 @@ export const workspaceRouter = createTRPCRouter({
        workspaceSlug: z
          .string()
          .min(3)
-          .max(64)
+          .max(24)
          .regex(/^(?![-]+$)[a-zA-Z0-9-]+$/),
      }),
    )
@@ -207,7 +207,7 @@ export const workspaceRouter = createTRPCRouter({
        slug: z
          .string()
          .min(3)
-          .max(64)
+          .max(24)
          .regex(/^(?![-]+$)[a-zA-Z0-9-]+$/)
          .optional(),
      }),
@@ -290,7 +290,7 @@ export const workspaceRouter = createTRPCRouter({
        slug: z
          .string()
          .min(3)
-          .max(64)
+          .max(24)
          .regex(/^(?![-]+$)[a-zA-Z0-9-]+$/)
          .optional(),
        description: z.string().min(3).max(280).optional(),
@@ -424,7 +424,7 @@ export const workspaceRouter = createTRPCRouter({
        workspaceSlug: z
          .string()
          .min(3)
-          .max(64)
+          .max(24)
          .regex(/^(?![-]+$)[a-zA-Z0-9-]+$/),
      }),
    )
--- a/packages/api/src/utils/notifications.ts
+++ b/packages/api/src/utils/notifications.ts
@@ -1,133 +0,0 @@
-import { env } from "next-runtime-env";
-
-import type { dbClient } from "@kan/db/client";
-import * as cardRepo from "@kan/db/repository/card.repo";
-import * as memberRepo from "@kan/db/repository/member.repo";
-import * as notificationRepo from "@kan/db/repository/notification.repo";
-import * as userRepo from "@kan/db/repository/user.repo";
-import * as workspaceRepo from "@kan/db/repository/workspace.repo";
-import { sendEmail } from "@kan/email";
-import { parseMentionsFromHTML } from "@kan/shared/utils";
-
-/**
- * Sends mention notification emails to mentioned members
- * Only sends emails for new mentions (checks notification table to avoid duplicates)
- */
-export async function sendMentionEmails({
-  db,
-  cardPublicId,
-  commentHtml,
-  commenterUserId,
-  commentId,
-}: {
-  db: dbClient;
-  cardPublicId: string;
-  commentHtml: string;
-  commenterUserId: string;
-  commentId?: number;
-}) {
-  try {
-    // Parse mentions from HTML
-    const mentionPublicIds = parseMentionsFromHTML(commentHtml);
-    if (mentionPublicIds.length === 0) return;
-
-    // Get card with board information
-    const card = await cardRepo.getWithListAndMembersByPublicId(db, cardPublicId);
-    if (!card?.list.board) return;
-
-    const board = card.list.board;
-    const boardName = board.name;
-    const cardTitle = card.title;
-    const cardId = card.id;
-
-    // Get workspace ID from workspace publicId
-    const workspace = await workspaceRepo.getByPublicId(
-      db,
-      board.workspace.publicId,
-    );
-    if (!workspace?.id) return;
-
-    const workspaceId = workspace.id;
-
-    // Get commenter information
-    const commenter = await userRepo.getById(db, commenterUserId);
-    if (!commenter) return;
-
-    const commenterName = commenter.name?.trim() || commenter.email;
-
-    // Get mentioned members with full details (filtered by workspace)
-    const membersWithDetails = await memberRepo.getByPublicIdsWithUsers(
-      db,
-      mentionPublicIds,
-      workspaceId,
-    );
-
-    // Filter out the commenter
-    const membersToNotify = membersWithDetails.filter(
-      (member) => member.user?.id !== commenterUserId,
-    );
-
-    if (membersToNotify.length === 0) return;
-
-    const baseUrl = env("NEXT_PUBLIC_BASE_URL");
-    const cardUrl = `${baseUrl}/cards/${cardPublicId}`;
-
-    // Send emails to all mentioned members (only if notification doesn't exist)
-    await Promise.all(
-      membersToNotify.map(async (member) => {
-        const userId = member.user?.id;
-        const email = member.user?.email ?? member.email;
-
-        // Skip pending members (no userId) - they can be mentioned but won't receive emails
-        if (!userId || !email) return;
-
-        try {
-          // Check if notification already exists for this mention
-          const notificationExists = await notificationRepo.exists(db, {
-            userId,
-            cardId,
-            type: "mention",
-          });
-
-          // If notification already exists, skip sending email
-          if (notificationExists) {
-            return;
-          }
-
-          // Create notification record
-          await notificationRepo.create(db, {
-            type: "mention",
-            userId,
-            cardId,
-            commentId,
-          });
-
-          // Send email
-          await sendEmail(
-            email,
-            `${commenterName} mentioned you in a comment on ${cardTitle}`,
-            "MENTION",
-            {
-              commenterName,
-              boardName,
-              cardTitle,
-              cardUrl,
-            },
-          );
-        } catch (error) {
-          console.error("Failed to send mention email:", {
-            email,
-            cardPublicId,
-            error: error instanceof Error ? error.message : String(error),
-          });
-        }
-      }),
-    );
-  } catch (error) {
-    console.error("Error sending mention emails:", {
-      cardPublicId,
-      error: error instanceof Error ? error.message : String(error),
-    });
-  }
-}
-
--- a/packages/auth/src/auth.ts
+++ b/packages/auth/src/auth.ts
@@ -11,14 +11,15 @@ import { createPlugins } from "./plugins";
 import { configuredProviders } from "./providers";

 export const initAuth = (db: dbClient) => {
-  const baseURL = env("NEXT_PUBLIC_BASE_URL") || env("BETTER_AUTH_URL");
-  const trustedOrigins =
-    env("BETTER_AUTH_TRUSTED_ORIGINS")?.split(",").filter(Boolean) ?? [];
-
  return betterAuth({
    secret: env("BETTER_AUTH_SECRET"),
-    baseURL,
-    trustedOrigins: [...(baseURL ? [baseURL] : []), ...trustedOrigins],
+    baseURL: env("NEXT_PUBLIC_BASE_URL"),
+    trustedOrigins: env("BETTER_AUTH_TRUSTED_ORIGINS")
+      ? [
+          env("NEXT_PUBLIC_BASE_URL") ?? "",
+          ...(env("BETTER_AUTH_TRUSTED_ORIGINS")?.split(",") ?? []),
+        ]
+      : [env("NEXT_PUBLIC_BASE_URL") ?? ""],
    database: drizzleAdapter(db, {
      provider: "pg",
      schema: {
--- a/packages/auth/src/plugins.ts
+++ b/packages/auth/src/plugins.ts
@@ -5,10 +5,9 @@ import { magicLink } from "better-auth/plugins/magic-link";
 import type { dbClient } from "@kan/db/client";
 import * as memberRepo from "@kan/db/repository/member.repo";
 import * as subscriptionRepo from "@kan/db/repository/subscription.repo";
-import * as userRepo from "@kan/db/repository/user.repo";
 import * as workspaceRepo from "@kan/db/repository/workspace.repo";
-import { sendEmail } from "@kan/email";
 import { generateUID } from "@kan/shared/utils";
+import { sendEmail } from "@kan/email";
 import { createStripeClient } from "@kan/stripe";

 import { socialProvidersPlugin } from "./providers";
@@ -134,21 +133,20 @@ export function createPlugins(db: dbClient) {

                if (workspace?.id) {
                  await memberRepo.pauseAllMembers(db, workspace.id);
-
+                  
                  // Reset slug to publicId, or generate a UID if publicId is taken
                  let newSlug = workspace.publicId;
-
+                  
                  if (workspace.slug !== workspace.publicId) {
-                    const isPublicIdAvailable =
-                      await workspaceRepo.isWorkspaceSlugAvailable(
-                        db,
-                        workspace.publicId,
-                      );
+                    const isPublicIdAvailable = await workspaceRepo.isWorkspaceSlugAvailable(
+                      db,
+                      workspace.publicId,
+                    );
                    if (!isPublicIdAvailable) {
                      newSlug = generateUID();
                    }
                  }
-
+                  
                  await workspaceRepo.update(db, subscription.referenceId, {
                    plan: "free",
                    slug: newSlug,
@@ -173,76 +171,18 @@ export function createPlugins(db: dbClient) {
    magicLink({
      expiresIn: 60 * 60 * 24 * 7, // 7 days
      sendMagicLink: async ({ email, url }) => {
-        try {
-          const decodedUrl = decodeURIComponent(url);
-          console.log("Sending magic link to:", email, "URL:", url);
-          console.log(
-            "Magic link contains invite:",
-            decodedUrl.includes("type=invite"),
-          );
-          if (decodedUrl.includes("type=invite")) {
-            let inviterName = "";
-            let workspaceName = "";
-
-            try {
-              const urlObj = new URL(url);
-              const callbackUrl = urlObj.searchParams.get("callbackURL");
-              if (callbackUrl) {
-                const callbackParams = new URL(
-                  callbackUrl,
-                  process.env.NEXT_PUBLIC_BASE_URL,
-                ).searchParams;
-                const memberPublicId = callbackParams.get("memberPublicId");
-
-                if (memberPublicId) {
-                  const member = await memberRepo.getByPublicId(
-                    db,
-                    memberPublicId,
-                  );
-                  if (member) {
-                    const [workspace, inviter] = await Promise.all([
-                      workspaceRepo.getById(db, member.workspaceId),
-                      userRepo.getById(db, member.createdBy),
-                    ]);
-
-                    if (workspace) workspaceName = workspace.name;
-                    if (inviter) inviterName = inviter.name ?? "";
-                  }
-                }
-              }
-            } catch (error) {
-              console.error("Failed to fetch invite details:", error);
-            }
-
-            await sendEmail(
-              email,
-              workspaceName
-                ? `Invitation to join the workspace ${workspaceName}`
-                : "Invitation to join workspace",
-              "JOIN_WORKSPACE",
-              {
-                magicLoginUrl: url,
-                inviterName,
-                workspaceName,
-              },
-            );
-          } else {
-            await sendEmail(
-              email,
-              process.env.NEXT_PUBLIC_WHITE_LABEL_HIDE_POWERED_BY === "true"
-                ? "Sign in to your account"
-                : "Sign in to Kan",
-              "MAGIC_LINK",
-              {
-                magicLoginUrl: url,
-              },
-            );
-          }
-        } catch (error) {
-          console.error("Error sending magic link:", {
+        if (url.includes("type=invite")) {
+          await sendEmail(
            email,
-            url,
-            error,
+            "Invitation to join workspace",
+            "JOIN_WORKSPACE",
+            {
+              magicLoginUrl: url,
+            },
+          );
+        } else {
+          await sendEmail(email, "Sign in to kan.bn", "MAGIC_LINK", {
+            magicLoginUrl: url,
          });
        }
      },
--- a/packages/db/migrations/20260129210000_AddWorkspaceWebhooks.sql
+++ b/packages/db/migrations/20260129210000_AddWorkspaceWebhooks.sql
@@ -1,28 +0,0 @@
-CREATE TABLE IF NOT EXISTS "workspace_webhooks" (
-	"id" bigserial PRIMARY KEY NOT NULL,
-	"publicId" varchar(12) NOT NULL,
-	"workspaceId" bigint NOT NULL,
-	"name" varchar(255) NOT NULL,
-	"url" varchar(2048) NOT NULL,
-	"secret" text,
-	"events" text NOT NULL,
-	"active" boolean DEFAULT true NOT NULL,
-	"createdBy" uuid NOT NULL,
-	"createdAt" timestamp DEFAULT now() NOT NULL,
-	"updatedAt" timestamp,
-	CONSTRAINT "workspace_webhooks_publicId_unique" UNIQUE("publicId")
-);
--> statement-breakpoint
-ALTER TABLE "workspace_webhooks" ENABLE ROW LEVEL SECURITY;--> statement-breakpoint
-CREATE INDEX IF NOT EXISTS "workspace_webhooks_workspace_idx" ON "workspace_webhooks" USING btree ("workspaceId");--> statement-breakpoint
-DO $$ BEGIN
- ALTER TABLE "workspace_webhooks" ADD CONSTRAINT "workspace_webhooks_workspaceId_workspace_id_fk" FOREIGN KEY ("workspaceId") REFERENCES "public"."workspace"("id") ON DELETE cascade ON UPDATE no action;
-EXCEPTION
- WHEN duplicate_object THEN null;
-END $$;
--> statement-breakpoint
-DO $$ BEGIN
- ALTER TABLE "workspace_webhooks" ADD CONSTRAINT "workspace_webhooks_createdBy_user_id_fk" FOREIGN KEY ("createdBy") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;
-EXCEPTION
- WHEN duplicate_object THEN null;
-END $$;
--- a/packages/db/migrations/20260207214056_AddNotificationsTable.sql
+++ b/packages/db/migrations/20260207214056_AddNotificationsTable.sql
@@ -1,46 +0,0 @@
-CREATE TYPE "public"."notification_type" AS ENUM('mention', 'workspace.member.added', 'workspace.member.removed', 'workspace.role.changed');--> statement-breakpoint
-CREATE TABLE IF NOT EXISTS "notification" (
-	"id" bigserial PRIMARY KEY NOT NULL,
-	"publicId" varchar(12) NOT NULL,
-	"type" "notification_type" NOT NULL,
-	"userId" uuid NOT NULL,
-	"cardId" bigint,
-	"commentId" bigint,
-	"workspaceId" bigint,
-	"metadata" text,
-	"readAt" timestamp,
-	"createdAt" timestamp DEFAULT now() NOT NULL,
-	"deletedAt" timestamp,
-	CONSTRAINT "notification_publicId_unique" UNIQUE("publicId")
-);
--> statement-breakpoint
-ALTER TABLE "notification" ENABLE ROW LEVEL SECURITY;--> statement-breakpoint
-DO $$ BEGIN
- ALTER TABLE "notification" ADD CONSTRAINT "notification_userId_user_id_fk" FOREIGN KEY ("userId") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;
-EXCEPTION
- WHEN duplicate_object THEN null;
-END $$;
--> statement-breakpoint
-DO $$ BEGIN
- ALTER TABLE "notification" ADD CONSTRAINT "notification_cardId_card_id_fk" FOREIGN KEY ("cardId") REFERENCES "public"."card"("id") ON DELETE cascade ON UPDATE no action;
-EXCEPTION
- WHEN duplicate_object THEN null;
-END $$;
--> statement-breakpoint
-DO $$ BEGIN
- ALTER TABLE "notification" ADD CONSTRAINT "notification_commentId_card_comments_id_fk" FOREIGN KEY ("commentId") REFERENCES "public"."card_comments"("id") ON DELETE cascade ON UPDATE no action;
-EXCEPTION
- WHEN duplicate_object THEN null;
-END $$;
--> statement-breakpoint
-DO $$ BEGIN
- ALTER TABLE "notification" ADD CONSTRAINT "notification_workspaceId_workspace_id_fk" FOREIGN KEY ("workspaceId") REFERENCES "public"."workspace"("id") ON DELETE cascade ON UPDATE no action;
-EXCEPTION
- WHEN duplicate_object THEN null;
-END $$;
--> statement-breakpoint
-CREATE INDEX IF NOT EXISTS "notification_user_deleted_idx" ON "notification" USING btree ("userId","deletedAt");--> statement-breakpoint
-CREATE INDEX IF NOT EXISTS "notification_user_read_deleted_idx" ON "notification" USING btree ("userId","readAt","deletedAt");--> statement-breakpoint
-CREATE INDEX IF NOT EXISTS "notification_user_type_card_idx" ON "notification" USING btree ("userId","type","cardId");--> statement-breakpoint
-CREATE INDEX IF NOT EXISTS "notification_user_type_workspace_idx" ON "notification" USING btree ("userId","type","workspaceId");--> statement-breakpoint
-CREATE INDEX IF NOT EXISTS "notification_user_created_idx" ON "notification" USING btree ("userId","createdAt");
--- a/packages/db/migrations/20260208033314_AddAttachmentToActivity.sql
+++ b/packages/db/migrations/20260208033314_AddAttachmentToActivity.sql
@@ -1,6 +0,0 @@
-ALTER TABLE "card_activity" ADD COLUMN "attachmentId" bigint;--> statement-breakpoint
-DO $$ BEGIN
- ALTER TABLE "card_activity" ADD CONSTRAINT "card_activity_attachmentId_card_attachment_id_fk" FOREIGN KEY ("attachmentId") REFERENCES "public"."card_attachment"("id") ON DELETE cascade ON UPDATE no action;
-EXCEPTION
- WHEN duplicate_object THEN null;
-END $$;
--- a/packages/db/migrations/meta/20260207214056_snapshot.json
+++ b/packages/db/migrations/meta/20260207214056_snapshot.json
--- a/packages/db/migrations/meta/20260208033314_snapshot.json
+++ b/packages/db/migrations/meta/20260208033314_snapshot.json
--- a/packages/db/migrations/meta/_journal.json
+++ b/packages/db/migrations/meta/_journal.json
@@ -176,27 +176,6 @@
      "when": 1769983198190,
      "tag": "20260201215958_AddUserBoardFavouritesTable",
      "breakpoints": true
-    },
-    {
-      "idx": 25,
-      "version": "7",
-      "when": 1770500457005,
-      "tag": "20260207214056_AddNotificationsTable",
-      "breakpoints": true
-    },
-    {
-      "idx": 26,
-      "version": "7",
-      "when": 1770521594167,
-      "tag": "20260208033314_AddAttachmentToActivity",
-      "breakpoints": true
-    },
-    {
-      "idx": 27,
-      "version": "7",
-      "when": 1771192000000,
-      "tag": "20260129210000_AddWorkspaceWebhooks",
-      "breakpoints": true
    }
  ]
 }
--- a/packages/db/src/repository/board.repo.ts
+++ b/packages/db/src/repository/board.repo.ts
@@ -212,7 +212,6 @@ export const getByPublicId = async (
            columns: {
              publicId: true,
              email: true,
-              status: true,
            },
            with: {
              user: {
--- a/packages/db/src/repository/card.repo.ts
+++ b/packages/db/src/repository/card.repo.ts
@@ -420,7 +420,6 @@ export const getWithListAndMembersByPublicId = async (
 ) => {
  const card = await db.query.cards.findFirst({
    columns: {
-      id: true,
      publicId: true,
      title: true,
      description: true,
@@ -508,7 +507,6 @@ export const getWithListAndMembersByPublicId = async (
                    columns: {
                      publicId: true,
                      email: true,
-                      status: true,
                    },
                    with: {
                      user: {
@@ -945,14 +943,12 @@ export const getWorkspaceAndCardIdByCardPublicId = async (
    where: and(eq(cards.publicId, cardPublicId), isNull(cards.deletedAt)),
    with: {
      list: {
-        columns: { name: true },
+        columns: {},
        with: {
          board: {
            columns: {
-              publicId: true,
              workspaceId: true,
              visibility: true,
-              name: true,
            },
          },
        },
@@ -966,9 +962,6 @@ export const getWorkspaceAndCardIdByCardPublicId = async (
        createdBy: result.createdBy,
        workspaceId: result.list.board.workspaceId,
        workspaceVisibility: result.list.board.visibility,
-        listName: result.list.name,
-        boardPublicId: result.list.board.publicId,
-        boardName: result.list.board.name,
      }
    : null;
 };
--- a/packages/db/src/repository/cardActivity.repo.ts
+++ b/packages/db/src/repository/cardActivity.repo.ts
@@ -33,7 +33,6 @@ export const create = async (
    fromDueDate?: Date;
    toDueDate?: Date;
    sourceBoardId?: number;
-    attachmentId?: number;
  },
 ) => {
  const [result] = await db
@@ -59,7 +58,6 @@ export const create = async (
      fromDueDate: activityInput.fromDueDate,
      toDueDate: activityInput.toDueDate,
      sourceBoardId: activityInput.sourceBoardId,
-      attachmentId: activityInput.attachmentId,
    })
    .returning({ id: cardActivities.id });

@@ -85,7 +83,6 @@ export const bulkCreate = async (
    fromDueDate?: Date;
    toDueDate?: Date;
    sourceBoardId?: number;
-    attachmentId?: number;
  }[],
 ) => {
  const activitiesWithPublicIds = activityInputs.map((activity) => ({
@@ -194,13 +191,6 @@ export const getPaginatedActivities = async (
          deletedAt: true,
        },
      },
-      attachment: {
-        columns: {
-          publicId: true,
-          filename: true,
-          originalFilename: true,
-        },
-      },
    },
    orderBy: asc(cardActivities.createdAt), // required for merging and pagination
    limit: limit + 1, // fetch one extra to check if there are more
--- a/packages/db/src/repository/list.repo.ts
+++ b/packages/db/src/repository/list.repo.ts
@@ -419,14 +419,12 @@ export const getWorkspaceAndListIdByListPublicId = async (
  listPublicId: string,
 ) => {
  const result = await db.query.lists.findFirst({
-    columns: { id: true, name: true, createdBy: true },
+    columns: { id: true, createdBy: true },
    where: and(eq(lists.publicId, listPublicId), isNull(lists.deletedAt)),
    with: {
      board: {
        columns: {
-          publicId: true,
          workspaceId: true,
-          name: true,
        },
      },
    },
@@ -435,11 +433,8 @@ export const getWorkspaceAndListIdByListPublicId = async (
  return result
    ? {
        id: result.id,
-        name: result.name,
        createdBy: result.createdBy,
        workspaceId: result.board.workspaceId,
-        boardPublicId: result.board.publicId,
-        boardName: result.board.name,
      }
    : null;
 };
--- a/packages/db/src/repository/member.repo.ts
+++ b/packages/db/src/repository/member.repo.ts
@@ -63,36 +63,6 @@ export const getById = async (db: dbClient, memberId: number) => {
  });
 };

-export const getByPublicIdsWithUsers = async (
-  db: dbClient,
-  memberPublicIds: string[],
-  workspaceId?: number,
-) => {
-  return db.query.workspaceMembers.findMany({
-    where: (members, { inArray: inArrayFn, eq, and, isNull: isNullFn }) => {
-      const conditions = [inArrayFn(members.publicId, memberPublicIds)];
-      
-      if (workspaceId) {
-        conditions.push(eq(members.workspaceId, workspaceId));
-      }
-      
-      conditions.push(eq(members.status, "active"));
-      conditions.push(isNullFn(members.deletedAt));
-      
-      return and(...conditions);
-    },
-    with: {
-      user: {
-        columns: {
-          id: true,
-          name: true,
-          email: true,
-        },
-      },
-    },
-  });
-};
-
 export const getByEmailAndStatus = async (
  db: dbClient,
  email: string,
--- a/packages/db/src/repository/notification.repo.ts
+++ b/packages/db/src/repository/notification.repo.ts
@@ -1,98 +0,0 @@
-import { and, count, eq, isNull } from "drizzle-orm";
-
-import type { dbClient } from "@kan/db/client";
-import type { NotificationType } from "@kan/db/schema";
-import { notifications } from "@kan/db/schema";
-import { generateUID } from "@kan/shared/utils";
-
-export const create = async (
-  db: dbClient,
-  notificationInput: {
-    type: NotificationType;
-    userId: string;
-    cardId?: number;
-    commentId?: number;
-    workspaceId?: number;
-    metadata?: string;
-  },
-) => {
-  const [result] = await db
-    .insert(notifications)
-    .values({
-      publicId: generateUID(),
-      type: notificationInput.type,
-      userId: notificationInput.userId,
-      cardId: notificationInput.cardId,
-      commentId: notificationInput.commentId,
-      workspaceId: notificationInput.workspaceId,
-      metadata: notificationInput.metadata,
-    })
-    .returning();
-
-  return result;
-};
-
-export const exists = async (
-  db: dbClient,
-  args: {
-    userId: string;
-    type: NotificationType;
-    cardId?: number;
-    workspaceId?: number;
-    commentId?: number;
-  },
-) => {
-  const result = await db.query.notifications.findFirst({
-    where: (notifications, { eq, and, isNull: isNullFn }) => {
-      const conditions = [
-        eq(notifications.userId, args.userId),
-        eq(notifications.type, args.type),
-        isNullFn(notifications.deletedAt),
-      ];
-
-      if (args.cardId) {
-        conditions.push(eq(notifications.cardId, args.cardId));
-      }
-
-      if (args.workspaceId) {
-        conditions.push(eq(notifications.workspaceId, args.workspaceId));
-      }
-
-      return and(...conditions);
-    },
-  });
-
-  return !!result;
-};
-
-export const markAsRead = async (
-  db: dbClient,
-  notificationId: number,
-) => {
-  const [result] = await db
-    .update(notifications)
-    .set({ readAt: new Date() })
-    .where(eq(notifications.id, notificationId))
-    .returning();
-
-  return result;
-};
-
-export const getUnreadCount = async (
-  db: dbClient,
-  userId: string,
-) => {
-  const result = await db
-    .select({ count: count() })
-    .from(notifications)
-    .where(
-      and(
-        eq(notifications.userId, userId),
-        isNull(notifications.readAt),
-        isNull(notifications.deletedAt),
-      ),
-    );
-
-  return result[0]?.count ?? 0;
-};
-
--- a/packages/db/src/repository/webhook.repo.ts
+++ b/packages/db/src/repository/webhook.repo.ts
@@ -1,175 +0,0 @@
-import { and, eq } from "drizzle-orm";
-
-import type { dbClient } from "@kan/db/client";
-import { workspaceWebhooks } from "@kan/db/schema";
-import { generateUID } from "@kan/shared/utils";
-
-import type { WebhookEvent } from "../schema/webhooks";
-
-/** Parse JSON-encoded events column into typed array */
-function parseEvents(raw: string): WebhookEvent[] {
-  return JSON.parse(raw) as WebhookEvent[];
-}
-
-export const create = async (
-  db: dbClient,
-  webhookInput: {
-    workspaceId: number;
-    name: string;
-    url: string;
-    secret?: string;
-    events: WebhookEvent[];
-    createdBy: string;
-  },
-) => {
-  const [webhook] = await db
-    .insert(workspaceWebhooks)
-    .values({
-      publicId: generateUID(),
-      workspaceId: webhookInput.workspaceId,
-      name: webhookInput.name,
-      url: webhookInput.url,
-      secret: webhookInput.secret,
-      events: JSON.stringify(webhookInput.events),
-      createdBy: webhookInput.createdBy,
-    })
-    .returning({
-      publicId: workspaceWebhooks.publicId,
-      name: workspaceWebhooks.name,
-      url: workspaceWebhooks.url,
-      events: workspaceWebhooks.events,
-      active: workspaceWebhooks.active,
-      createdAt: workspaceWebhooks.createdAt,
-    });
-
-  return webhook
-    ? {
-        ...webhook,
-        events: parseEvents(webhook.events),
-      }
-    : null;
-};
-
-export const update = async (
-  db: dbClient,
-  webhookPublicId: string,
-  webhookInput: {
-    name?: string;
-    url?: string;
-    secret?: string;
-    events?: WebhookEvent[];
-    active?: boolean;
-  },
-) => {
-  const [result] = await db
-    .update(workspaceWebhooks)
-    .set({
-      name: webhookInput.name,
-      url: webhookInput.url,
-      secret: webhookInput.secret,
-      events: webhookInput.events
-        ? JSON.stringify(webhookInput.events)
-        : undefined,
-      active: webhookInput.active,
-      updatedAt: new Date(),
-    })
-    .where(eq(workspaceWebhooks.publicId, webhookPublicId))
-    .returning({
-      publicId: workspaceWebhooks.publicId,
-      name: workspaceWebhooks.name,
-      url: workspaceWebhooks.url,
-      events: workspaceWebhooks.events,
-      active: workspaceWebhooks.active,
-      createdAt: workspaceWebhooks.createdAt,
-      updatedAt: workspaceWebhooks.updatedAt,
-    });
-
-  return result
-    ? {
-        ...result,
-        events: parseEvents(result.events),
-      }
-    : null;
-};
-
-export const getByPublicId = async (db: dbClient, webhookPublicId: string) => {
-  const result = await db.query.workspaceWebhooks.findFirst({
-    columns: {
-      id: true,
-      publicId: true,
-      workspaceId: true,
-      name: true,
-      url: true,
-      secret: true,
-      events: true,
-      active: true,
-      createdAt: true,
-      updatedAt: true,
-    },
-    where: eq(workspaceWebhooks.publicId, webhookPublicId),
-  });
-
-  return result
-    ? {
-        ...result,
-        events: parseEvents(result.events),
-      }
-    : null;
-};
-
-export const getAllByWorkspaceId = async (
-  db: dbClient,
-  workspaceId: number,
-) => {
-  const results = await db.query.workspaceWebhooks.findMany({
-    columns: {
-      publicId: true,
-      name: true,
-      url: true,
-      events: true,
-      active: true,
-      createdAt: true,
-      updatedAt: true,
-    },
-    where: eq(workspaceWebhooks.workspaceId, workspaceId),
-  });
-
-  return results.map((webhook) => ({
-    ...webhook,
-    events: parseEvents(webhook.events),
-  }));
-};
-
-/**
- * Returns active webhooks with secrets for server-side delivery (HMAC signing).
- * DO NOT expose this via tRPC or any client-facing endpoint.
- * Use getAllByWorkspaceId (which omits secrets) for the admin list endpoint.
- */
-export const getActiveByWorkspaceId = async (
-  db: dbClient,
-  workspaceId: number,
-) => {
-  const results = await db.query.workspaceWebhooks.findMany({
-    columns: {
-      publicId: true,
-      url: true,
-      secret: true,
-      events: true,
-    },
-    where: and(
-      eq(workspaceWebhooks.workspaceId, workspaceId),
-      eq(workspaceWebhooks.active, true),
-    ),
-  });
-
-  return results.map((webhook) => ({
-    ...webhook,
-    events: parseEvents(webhook.events),
-  }));
-};
-
-export const hardDelete = (db: dbClient, webhookPublicId: string) => {
-  return db
-    .delete(workspaceWebhooks)
-    .where(eq(workspaceWebhooks.publicId, webhookPublicId));
-};
--- a/packages/db/src/schema/cards.ts
+++ b/packages/db/src/schema/cards.ts
@@ -147,10 +147,6 @@ export const cardActivities = pgTable("card_activity", {
    () => boards.id,
    { onDelete: "set null" },
  ),
-  attachmentId: bigint("attachmentId", { mode: "number" }).references(
-    () => cardAttachments.id,
-    { onDelete: "cascade" },
-  ),
 }).enableRLS();

 export const cardActivitiesRelations = relations(cardActivities, ({ one }) => ({
@@ -194,11 +190,6 @@ export const cardActivitiesRelations = relations(cardActivities, ({ one }) => ({
    references: [comments.id],
    relationName: "cardActivitiesComment",
  }),
-  attachment: one(cardAttachments, {
-    fields: [cardActivities.attachmentId],
-    references: [cardAttachments.id],
-    relationName: "cardActivitiesAttachment",
-  }),
 }));

 export const cardsToLabels = pgTable(
--- a/packages/db/src/schema/index.ts
+++ b/packages/db/src/schema/index.ts
@@ -13,5 +13,3 @@ export * from "./workspaces";
 export * from "./subscriptions";
 export * from "./workspaceInviteLinks";
 export * from "./permissions";
-export * from "./notifications";
-export * from "./webhooks";
--- a/packages/db/src/schema/notifications.ts
+++ b/packages/db/src/schema/notifications.ts
@@ -1,98 +0,0 @@
-import { relations } from "drizzle-orm";
-import {
-  bigint,
-  bigserial,
-  index,
-  pgEnum,
-  pgTable,
-  text,
-  timestamp,
-  uuid,
-  varchar,
-} from "drizzle-orm/pg-core";
-
-import { cards } from "./cards";
-import { comments } from "./cards";
-import { users } from "./users";
-import { workspaces } from "./workspaces";
-
-export const notificationTypes = [
-  "mention",
-  "workspace.member.added",
-  "workspace.member.removed",
-  "workspace.role.changed",
-] as const;
-
-export type NotificationType = (typeof notificationTypes)[number];
-
-export const notificationTypeEnum = pgEnum("notification_type", notificationTypes);
-
-export const notifications = pgTable(
-  "notification",
-  {
-    id: bigserial("id", { mode: "number" }).primaryKey(),
-    publicId: varchar("publicId", { length: 12 }).notNull().unique(),
-    type: notificationTypeEnum("type").notNull(),
-    userId: uuid("userId")
-      .notNull()
-      .references(() => users.id, { onDelete: "cascade" }),
-    cardId: bigint("cardId", { mode: "number" }).references(() => cards.id, {
-      onDelete: "cascade",
-    }),
-    commentId: bigint("commentId", { mode: "number" }).references(
-      () => comments.id,
-      { onDelete: "cascade" },
-    ),
-    workspaceId: bigint("workspaceId", { mode: "number" }).references(
-      () => workspaces.id,
-      { onDelete: "cascade" },
-    ),
-    metadata: text("metadata"),
-    readAt: timestamp("readAt"),
-    createdAt: timestamp("createdAt").defaultNow().notNull(),
-    deletedAt: timestamp("deletedAt"),
-  },
-  (table) => [
-    index("notification_user_deleted_idx").on(table.userId, table.deletedAt),
-    index("notification_user_read_deleted_idx").on(
-      table.userId,
-      table.readAt,
-      table.deletedAt,
-    ),
-    index("notification_user_type_card_idx").on(
-      table.userId,
-      table.type,
-      table.cardId,
-    ),
-    index("notification_user_type_workspace_idx").on(
-      table.userId,
-      table.type,
-      table.workspaceId,
-    ),
-    index("notification_user_created_idx").on(table.userId, table.createdAt),
-  ],
-).enableRLS();
-
-export const notificationsRelations = relations(notifications, ({ one }) => ({
-  user: one(users, {
-    fields: [notifications.userId],
-    references: [users.id],
-    relationName: "notificationsUser",
-  }),
-  card: one(cards, {
-    fields: [notifications.cardId],
-    references: [cards.id],
-    relationName: "notificationsCard",
-  }),
-  comment: one(comments, {
-    fields: [notifications.commentId],
-    references: [comments.id],
-    relationName: "notificationsComment",
-  }),
-  workspace: one(workspaces, {
-    fields: [notifications.workspaceId],
-    references: [workspaces.id],
-    relationName: "notificationsWorkspace",
-  }),
-}));
-
--- a/packages/db/src/schema/webhooks.ts
+++ b/packages/db/src/schema/webhooks.ts
@@ -1,59 +0,0 @@
-import { relations } from "drizzle-orm";
-import {
-  bigint,
-  bigserial,
-  boolean,
-  index,
-  pgTable,
-  text,
-  timestamp,
-  uuid,
-  varchar,
-} from "drizzle-orm/pg-core";
-
-import { users } from "./users";
-import { workspaces } from "./workspaces";
-
-export const webhookEvents = [
-  "card.created",
-  "card.updated",
-  "card.moved",
-  "card.deleted",
-] as const;
-export type WebhookEvent = (typeof webhookEvents)[number];
-
-export const workspaceWebhooks = pgTable("workspace_webhooks", {
-  id: bigserial("id", { mode: "number" }).primaryKey(),
-  publicId: varchar("publicId", { length: 12 }).notNull().unique(),
-  workspaceId: bigint("workspaceId", { mode: "number" })
-    .notNull()
-    .references(() => workspaces.id, { onDelete: "cascade" }),
-  name: varchar("name", { length: 255 }).notNull(),
-  url: varchar("url", { length: 2048 }).notNull(),
-  secret: text("secret"),
-  events: text("events").notNull(), // JSON array of webhook events
-  active: boolean("active").notNull().default(true),
-  createdBy: uuid("createdBy")
-    .notNull()
-    .references(() => users.id, { onDelete: "cascade" }),
-  createdAt: timestamp("createdAt").defaultNow().notNull(),
-  updatedAt: timestamp("updatedAt"),
-}, (table) => [
-  index("workspace_webhooks_workspace_idx").on(table.workspaceId),
-]).enableRLS();
-
-export const workspaceWebhooksRelations = relations(
-  workspaceWebhooks,
-  ({ one }) => ({
-    workspace: one(workspaces, {
-      fields: [workspaceWebhooks.workspaceId],
-      references: [workspaces.id],
-      relationName: "workspaceWebhooksWorkspace",
-    }),
-    createdByUser: one(users, {
-      fields: [workspaceWebhooks.createdBy],
-      references: [users.id],
-      relationName: "workspaceWebhooksCreatedByUser",
-    }),
-  }),
-);
--- a/packages/email/src/sendEmail.tsx
+++ b/packages/email/src/sendEmail.tsx
@@ -3,16 +3,14 @@ import nodemailer from "nodemailer";

 import JoinWorkspaceTemplate from "./templates/join-workspace";
 import MagicLinkTemplate from "./templates/magic-link";
-import MentionTemplate from "./templates/mention";
 import ResetPasswordTemplate from "./templates/reset-password";

-type Templates = "MAGIC_LINK" | "JOIN_WORKSPACE" | "RESET_PASSWORD" | "MENTION";
+type Templates = "MAGIC_LINK" | "JOIN_WORKSPACE" | "RESET_PASSWORD";

-const emailTemplates: Record<Templates, React.ComponentType<any>> = {
+const emailTemplates: Record<Templates, React.FC> = {
  MAGIC_LINK: MagicLinkTemplate,
  JOIN_WORKSPACE: JoinWorkspaceTemplate,
  RESET_PASSWORD: ResetPasswordTemplate,
-  MENTION: MentionTemplate,
 };

 const transporter = nodemailer.createTransport({
--- a/packages/email/src/templates/join-workspace.tsx
+++ b/packages/email/src/templates/join-workspace.tsx
@@ -13,16 +13,12 @@ import * as React from "react";

 export const JoinWorkspaceTemplate = ({
  magicLoginUrl,
-  inviterName,
-  workspaceName,
 }: {
  magicLoginUrl?: string;
-  inviterName?: string;
-  workspaceName?: string;
 }) => (
  <Html>
    <Head />
-    <Preview>Join {workspaceName ?? "workspace"} on kan.bn</Preview>
+    <Preview>Log in with this magic link</Preview>
    <Body style={{ backgroundColor: "white" }}>
      <Container
        style={{
@@ -42,16 +38,12 @@ export const JoinWorkspaceTemplate = ({
            color: "#232323",
          }}
        >
-          {env("NEXT_PUBLIC_WHITE_LABEL_HIDE_POWERED_BY") !== "true" && "Kan"}
+          kan.bn
        </Heading>
        <Heading
          style={{ fontSize: "24px", fontWeight: "bold", color: "#232323" }}
        >
-          {inviterName
-            ? `${inviterName} invited you to join ${
-                workspaceName ?? "a workspace"
-              }`
-            : `You've been invited to join ${workspaceName ?? "a workspace"}`}
+          Login to your Kan account
        </Heading>
        <Text
          style={{
@@ -60,7 +52,7 @@ export const JoinWorkspaceTemplate = ({
            color: "#232323",
          }}
        >
-          Click the button below to add this workspace to your account.
+          Click the button below to instantly login to your account.
        </Text>
        <Button
          target="_blank"
@@ -79,7 +71,7 @@ export const JoinWorkspaceTemplate = ({
            color: "white",
          }}
        >
-          Join {workspaceName ?? "workspace"}
+          Login to your account
        </Button>
        <Text
          style={{
@@ -88,29 +80,25 @@ export const JoinWorkspaceTemplate = ({
            color: "#7e7e7e",
          }}
        >
-          If you don&apos;t want to join this workspace, you can safely ignore this email.
+          If you didn&apos;t try to login, you can safely ignore this email.
+        </Text>
+        <Hr
+          style={{
+            marginTop: "2.5rem",
+            marginBottom: "2rem",
+            borderWidth: "1px",
+          }}
+        />
+        <Text style={{ color: "#7e7e7e" }}>
+          <Link
+            href={env("NEXT_PUBLIC_BASE_URL")}
+            target="_blank"
+            style={{ color: "#7e7e7e", textDecoration: "underline" }}
+          >
+            Kan
+          </Link>
+          , the open source Trello alternative.
        </Text>
-        {env("NEXT_PUBLIC_WHITE_LABEL_HIDE_POWERED_BY") !== "true" && (
-          <>
-            <Hr
-              style={{
-                marginTop: "2.5rem",
-                marginBottom: "2rem",
-                borderWidth: "1px",
-              }}
-            />
-            <Text style={{ color: "#7e7e7e" }}>
-              <Link
-                href={env("NEXT_PUBLIC_BASE_URL")}
-                target="_blank"
-                style={{ color: "#7e7e7e", textDecoration: "underline" }}
-              >
-                Kan
-              </Link>
-              , the open source Trello alternative.
-            </Text>
-          </>
-        )}
      </Container>
    </Body>
  </Html>
--- a/packages/email/src/templates/mention.tsx
+++ b/packages/email/src/templates/mention.tsx
@@ -1,108 +0,0 @@
-import { Body } from "@react-email/body";
-import { Button } from "@react-email/button";
-import { Container } from "@react-email/container";
-import { Head } from "@react-email/head";
-import { Heading } from "@react-email/heading";
-import { Hr } from "@react-email/hr";
-import { Html } from "@react-email/html";
-import { Link } from "@react-email/link";
-import { Preview } from "@react-email/preview";
-import { Text } from "@react-email/text";
-import { env } from "next-runtime-env";
-import * as React from "react";
-
-export const MentionTemplate = ({
-  commenterName,
-  boardName,
-  cardTitle,
-  cardUrl,
-}: {
-  commenterName: string;
-  boardName: string;
-  cardTitle: string;
-  cardUrl: string;
-}) => (
-  <Html>
-    <Head />
-    <Preview>
-      {commenterName} mentioned you in a comment on {cardTitle}
-    </Preview>
-    <Body style={{ backgroundColor: "white" }}>
-      <Container
-        style={{
-          fontFamily:
-            '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif',
-          margin: "auto",
-          paddingLeft: "0.75rem",
-          paddingRight: "0.75rem",
-        }}
-      >
-        <Heading
-          style={{
-            marginTop: "2.5rem",
-            marginBottom: "2.5rem",
-            fontSize: "24px",
-            fontWeight: "bold",
-            color: "#232323",
-          }}
-        >
-          kan.bn
-        </Heading>
-        <Heading
-          style={{ fontSize: "24px", fontWeight: "bold", color: "#232323" }}
-        >
-          You were mentioned in a comment
-        </Heading>
-        <Text
-          style={{
-            fontSize: "0.875rem",
-            marginBottom: "1rem",
-            color: "#232323",
-          }}
-        >
-          <strong>{commenterName}</strong> mentioned you in a comment on the
-          card <strong>{cardTitle}</strong> in the board <strong>{boardName}</strong>.
-        </Text>
-        <Button
-          target="_blank"
-          href={cardUrl}
-          style={{
-            marginBottom: "2rem",
-            borderRadius: "0.375rem",
-            backgroundColor: "#282828",
-            paddingLeft: "1.5rem",
-            paddingRight: "1.5rem",
-            paddingTop: "1rem",
-            paddingBottom: "1rem",
-            fontSize: "0.875rem",
-            fontWeight: "500",
-            lineHeight: "1",
-            color: "white",
-          }}
-        >
-          View Card
-        </Button>
-        <Hr
-          style={{
-            marginTop: "2.5rem",
-            marginBottom: "2rem",
-            borderWidth: "1px",
-          }}
-        />
-        <Text style={{ color: "#7e7e7e" }}>
-          <Link
-            href={env("NEXT_PUBLIC_BASE_URL")}
-            target="_blank"
-            style={{ color: "#7e7e7e", textDecoration: "underline" }}
-          >
-            Kan
-          </Link>
-          , the open source Trello alternative.
-        </Text>
-      </Container>
-    </Body>
-  </Html>
-);
-
-export default MentionTemplate;
-
--- a/packages/shared/src/utils/index.ts
+++ b/packages/shared/src/utils/index.ts
@@ -4,4 +4,3 @@ export * from "./subscriptions";
 export * from "./email";
 export * from "./dueDateFilters";
 export * from "./s3";
-export * from "./mentions";
--- a/packages/shared/src/utils/mentions.ts
+++ b/packages/shared/src/utils/mentions.ts
@@ -1,22 +0,0 @@
-/**
- * Parses mention data-id attributes from HTML content
- * Mentions are stored as: <span data-type="mention" data-id="..." data-label="...">@label</span>
- * @param htmlContent - The HTML content to parse
- * @returns Array of unique mention public IDs
- */
-export function parseMentionsFromHTML(htmlContent: string): string[] {
-  if (!htmlContent) return [];
-
-  // Match all mention spans with data-id attributes
-  const mentionRegex = /<span[^>]*data-type="mention"[^>]*data-id="([^"]+)"[^>]*>/gi;
-  const matches = Array.from(htmlContent.matchAll(mentionRegex));
-  
-  // Extract unique mention IDs
-  const mentionIds = matches
-    .map((match) => match[1])
-    .filter((id): id is string => !!id && id.length >= 12);
-
-  // Return unique IDs
-  return Array.from(new Set(mentionIds));
-}
-
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
Author	SHA1	Message	Date
Henry	d1d8a43d3c	fix: remove content type restriction on attachments	2026-02-04 22:37:18 +00:00
Henry	8ed719c485	fix: support external avatar URLs in generateAvatarUrl	2026-02-04 22:20:23 +00:00
Henry	f455bec6a7	fix: hide tooltip if content is empty	2026-02-04 21:57:50 +00:00
Henry	aee5391f28	fix: show avatar image in user menu	2026-02-04 21:53:04 +00:00
Henry	c8517ed4c2	feat: generate presigned URLs for avatars	2026-02-04 21:50:37 +00:00
Henry	ceac4c0d81	refactor: use createS3Client in auth hooks	2026-02-04 20:49:20 +00:00
Henry	4c5856ec24	feat: update avatar upload to use new endpoint	2026-02-04 20:47:26 +00:00
Henry	976373a65b	refactor: replace presigned URL uploads with backend upload endpoints	2026-02-04 20:46:23 +00:00