diff --git a/apps/web/app/not-found.tsx b/apps/web/app/not-found.tsx
index 8dc016bb..8cea602c 100644
--- a/apps/web/app/not-found.tsx
+++ b/apps/web/app/not-found.tsx
@@ -1,4 +1,5 @@
-// Standalone 404 page without any imports to avoid context issues during build
+import Link from 'next/link';
+
 export const metadata = {
     title: '404 - Page Not Found | VT',
     description:
@@ -13,112 +14,19 @@ export const metadata = {
 
 export default function NotFound() {
     return (
-        <html lang='en'>
-            <head>
-                <meta charSet='utf-8' />
-                <meta name='viewport' content='width=device-width, initial-scale=1' />
-                <title>404 - Page Not Found | VT</title>
-                <style>
-                    {`
-                    * {
-                        box-sizing: border-box;
-                        margin: 0;
-                        padding: 0;
-                    }
-
-                    body {
-                        font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
-                        background-color: hsl(0 0% 100%);
-                        color: hsl(0 0% 3.9%);
-                        line-height: 1.5;
-                    }
-
-                    @media (prefers-color-scheme: dark) {
-                        body {
-                            background-color: hsl(0 0% 3.9%);
-                            color: hsl(0 0% 98%);
-                        }
-                    }
-
-                    .container {
-                        display: flex;
-                        min-height: 100vh;
-                        flex-direction: column;
-                        align-items: center;
-                        justify-content: center;
-                    }
-
-                    .content {
-                        width: 100%;
-                        max-width: 28rem;
-                        padding: 1.5rem;
-                        text-align: center;
-                    }
-
-                    .title {
-                        margin-bottom: 0.75rem;
-                        font-size: 1.125rem;
-                        font-weight: 500;
-                    }
-
-                    .description {
-                        margin-bottom: 1rem;
-                        font-size: 0.875rem;
-                        color: hsl(0 0% 45.1%);
-                    }
-
-                    @media (prefers-color-scheme: dark) {
-                        .description {
-                            color: hsl(0 0% 63.9%);
-                        }
-                    }
-
-                    .button {
-                        display: inline-flex;
-                        height: 2.25rem;
-                        align-items: center;
-                        justify-content: center;
-                        border-radius: 0.375rem;
-                        padding: 0.5rem 1rem;
-                        font-size: 0.875rem;
-                        font-weight: 500;
-                        text-decoration: none;
-                        background-color: hsl(0 0% 9%);
-                        color: hsl(0 0% 98%);
-                        box-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05);
-                        transition: background-color 0.2s;
-                    }
-
-                    .button:hover {
-                        background-color: hsl(0 0% 9% / 0.9);
-                    }
-
-                    @media (prefers-color-scheme: dark) {
-                        .button {
-                            background-color: hsl(0 0% 98%);
-                            color: hsl(0 0% 9%);
-                        }
-
-                        .button:hover {
-                            background-color: hsl(0 0% 98% / 0.9);
-                        }
-                    }
-                `}
-                </style>
-            </head>
-            <body>
-                <div className='container'>
-                    <div className='content'>
-                        <h1 className='title'>404 - Page Not Found</h1>
-                        <p className='description'>
-                            Sorry, we couldn't find the page you're looking for.
-                        </p>
-                        <a href='/' className='button'>
-                            Back to VT
-                        </a>
-                    </div>
-                </div>
-            </body>
-        </html>
+        <div className='flex min-h-[100dvh] flex-col items-center justify-center'>
+            <div className='w-full max-w-md px-6 text-center'>
+                <h1 className='mb-3 text-lg font-medium'>404 - Page Not Found</h1>
+                <p className='mb-4 text-sm text-muted-foreground'>
+                    Sorry, we couldn't find the page you're looking for.
+                </p>
+                <Link
+                    href='/'
+                    className='inline-flex h-9 items-center justify-center rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground shadow transition-colors hover:bg-primary/90'
+                >
+                    Back to VT
+                </Link>
+            </div>
+        </div>
     );
 }
diff --git a/bun.lock b/bun.lock
index 58ea55cd..2205a74d 100644
--- a/bun.lock
+++ b/bun.lock
@@ -3166,7 +3166,7 @@
 
     "rc-checkbox": ["rc-checkbox@3.5.0", "", { "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "^2.3.2", "rc-util": "^5.25.2" }, "peerDependencies": { "react": ">=16.9.0", "react-dom": ">=16.9.0" } }, "sha512-aOAQc3E98HteIIsSqm6Xk2FPKIER6+5vyEFMZfo73TqM+VVAIqOkHoPjgKLqSNtVLWScoaM7vY2ZrGEheI79yg=="],
 
-    "rc-collapse": ["rc-collapse@4.0.0", "", { "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "2.x", "rc-motion": "^2.3.4", "rc-util": "^5.27.0" }, "peerDependencies": { "react": ">=16.9.0", "react-dom": ">=16.9.0" } }, "sha512-SwoOByE39/3oIokDs/BnkqI+ltwirZbP8HZdq1/3SkPSBi7xDdvWHTp7cpNI9ullozkR6mwTWQi6/E/9huQVrA=="],
+    "rc-collapse": ["rc-collapse@3.9.0", "", { "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "2.x", "rc-motion": "^2.3.4", "rc-util": "^5.27.0" }, "peerDependencies": { "react": ">=16.9.0", "react-dom": ">=16.9.0" } }, "sha512-swDdz4QZ4dFTo4RAUMLL50qP0EY62N2kvmk2We5xYdRwcRn8WcYtuetCJpwpaCbUfUt5+huLpVxhvmnK+PHrkA=="],
 
     "rc-dialog": ["rc-dialog@9.6.0", "", { "dependencies": { "@babel/runtime": "^7.10.1", "@rc-component/portal": "^1.0.0-8", "classnames": "^2.2.6", "rc-motion": "^2.3.0", "rc-util": "^5.21.0" }, "peerDependencies": { "react": ">=16.9.0", "react-dom": ">=16.9.0" } }, "sha512-ApoVi9Z8PaCQg6FsUzS8yvBEQy0ZL2PkuvAgrmohPkN3okps5WZ5WQWPc1RNuiOKaAYv8B97ACdsFU5LizzCqg=="],
 
@@ -3978,6 +3978,8 @@
 
     "@lobehub/ui/lucide-react": ["lucide-react@0.525.0", "", { "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-Tm1txJ2OkymCGkvwoHt33Y2JpN5xucVq1slHcgE6Lk0WjDfjgKWor5CdVER8U6DvcfMwh4M8XxmpTiyzfmfDYQ=="],
 
+    "@lobehub/ui/rc-collapse": ["rc-collapse@4.0.0", "", { "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "2.x", "rc-motion": "^2.3.4", "rc-util": "^5.27.0" }, "peerDependencies": { "react": ">=16.9.0", "react-dom": ">=16.9.0" } }, "sha512-SwoOByE39/3oIokDs/BnkqI+ltwirZbP8HZdq1/3SkPSBi7xDdvWHTp7cpNI9ullozkR6mwTWQi6/E/9huQVrA=="],
+
     "@mrleebo/prisma-ast/lilconfig": ["lilconfig@2.1.0", "", {}, "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="],
 
     "@neondatabase/serverless/@types/node": ["@types/node@22.17.0", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-bbAKTCqX5aNVryi7qXVMi+OkB3w/OyblodicMbvE38blyAz7GxXf6XYhklokijuPwwVg9sDLKRxt0ZHXQwZVfQ=="],
@@ -4092,8 +4094,6 @@
 
     "ai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@2.2.8", "", { "dependencies": { "@ai-sdk/provider": "1.1.3", "nanoid": "^3.3.8", "secure-json-parse": "^2.7.0" }, "peerDependencies": { "zod": "^3.23.8" } }, "sha512-fqhG+4sCVv8x7nFzYnFo19ryhAa3w096Kmc3hWxMQfW/TubPOmt3A6tYZhl4mUfQWWQMsuSkLrtjlWuXBVSGQA=="],
 
-    "antd/rc-collapse": ["rc-collapse@3.9.0", "", { "dependencies": { "@babel/runtime": "^7.10.1", "classnames": "2.x", "rc-motion": "^2.3.4", "rc-util": "^5.27.0" }, "peerDependencies": { "react": ">=16.9.0", "react-dom": ">=16.9.0" } }, "sha512-swDdz4QZ4dFTo4RAUMLL50qP0EY62N2kvmk2We5xYdRwcRn8WcYtuetCJpwpaCbUfUt5+huLpVxhvmnK+PHrkA=="],
-
     "anymatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
 
     "asn1.js/bn.js": ["bn.js@4.12.2", "", {}, "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw=="],
