diff --git a/client/pages/Terms.tsx b/client/pages/Terms.tsx
index 6edaa506..b3c2108a 100644
--- a/client/pages/Terms.tsx
+++ b/client/pages/Terms.tsx
@@ -4,27 +4,107 @@ export default function Terms() {
   return (
     <Layout>
       <div className="min-h-screen bg-aethex-gradient py-12">
-        <div className="container mx-auto px-4 max-w-4xl space-y-6">
-          <h1 className="text-3xl font-bold text-gradient-purple">
-            Terms of Service
-          </h1>
-          <p className="text-sm text-muted-foreground">
-            By using AeThex services, you agree to the following terms.
-          </p>
-          <section className="space-y-3">
-            <h2 className="font-semibold">Use of Service</h2>
+        <div className="container mx-auto px-4 max-w-4xl space-y-8">
+          <header className="space-y-2">
+            <h1 className="text-3xl font-bold text-gradient-purple">Terms of Service</h1>
+            <p className="text-sm text-muted-foreground">Effective date: 2025-10-18</p>
             <p className="text-sm text-muted-foreground">
-              You agree not to misuse or attempt to disrupt our services.
+              These Terms govern your access to and use of the AeThex Services. By using the Services,
+              you agree to these Terms.
             </p>
-            <h2 className="font-semibold">Accounts</h2>
+          </header>
+
+          <section className="space-y-3">
+            <h2 className="font-semibold">Accounts & Eligibility</h2>
             <p className="text-sm text-muted-foreground">
-              Keep your credentials secure. You're responsible for activity
+              You must be at least 13 years old (or the age required by your jurisdiction). You are
+              responsible for maintaining the confidentiality of your credentials and for all activity
               under your account.
             </p>
-            <h2 className="font-semibold">Liability</h2>
+          </section>
+
+          <section className="space-y-3">
+            <h2 className="font-semibold">User Content & License</h2>
             <p className="text-sm text-muted-foreground">
-              Services are provided as-is without warranties to the fullest
-              extent permitted by law.
+              You retain ownership of content you submit. You grant AeThex a worldwide, non-exclusive,
+              royalty-free license to host, store, reproduce, and display your content solely to operate
+              and improve the Services. You represent you have the rights to submit such content.
+            </p>
+          </section>
+
+          <section className="space-y-3">
+            <h2 className="font-semibold">Acceptable Use</h2>
+            <ul className="list-disc pl-5 text-sm text-muted-foreground space-y-1">
+              <li>No unlawful, infringing, or deceptive activity.</li>
+              <li>No harassment, hate, or exploitation.</li>
+              <li>No malware, spam, scraping, or abuse of API limits.</li>
+              <li>No attempts to access others’ accounts or data without permission.</li>
+            </ul>
+          </section>
+
+          <section className="space-y-3">
+            <h2 className="font-semibold">Projects, Teams, and Matching</h2>
+            <p className="text-sm text-muted-foreground">
+              Collaboration features (projects, teams, tasks, endorsements) are provided as-is. Team owners
+              and project owners are responsible for membership, roles, and shared materials.
+            </p>
+          </section>
+
+          <section className="space-y-3">
+            <h2 className="font-semibold">Third-Party Services</h2>
+            <p className="text-sm text-muted-foreground">
+              We may integrate third-party services (e.g., Supabase, Resend, hosting/CDN). Your use of
+              those services is subject to their terms and policies.
+            </p>
+          </section>
+
+          <section className="space-y-3">
+            <h2 className="font-semibold">Intellectual Property</h2>
+            <p className="text-sm text-muted-foreground">
+              AeThex and its licensors retain all rights to the platform, branding, and software. You may
+              not copy, modify, or distribute platform code or assets except as permitted by law or written
+              authorization.
+            </p>
+          </section>
+
+          <section className="space-y-3">
+            <h2 className="font-semibold">Termination</h2>
+            <p className="text-sm text-muted-foreground">
+              We may suspend or terminate your access for violations or risk to the platform. You may
+              discontinue use at any time.
+            </p>
+          </section>
+
+          <section className="space-y-3">
+            <h2 className="font-semibold">Disclaimers & Limitation of Liability</h2>
+            <p className="text-sm text-muted-foreground">
+              The Services are provided “as-is” without warranties. To the maximum extent permitted by law,
+              AeThex will not be liable for indirect, incidental, or consequential damages arising from or
+              related to your use of the Services.
+            </p>
+          </section>
+
+          <section className="space-y-3">
+            <h2 className="font-semibold">Indemnification</h2>
+            <p className="text-sm text-muted-foreground">
+              You agree to indemnify and hold AeThex harmless from claims arising out of your content or
+              misuse of the Services.
+            </p>
+          </section>
+
+          <section className="space-y-3">
+            <h2 className="font-semibold">Changes to Terms</h2>
+            <p className="text-sm text-muted-foreground">
+              We may update these Terms. Material changes will be announced via the app or email. Your
+              continued use constitutes acceptance of updated Terms.
+            </p>
+          </section>
+
+          <section className="space-y-3">
+            <h2 className="font-semibold">Governing Law & Contact</h2>
+            <p className="text-sm text-muted-foreground">
+              These Terms are governed by applicable laws of the United States. For questions, contact
+              legal@aethex.biz.
             </p>
           </section>
         </div>