diff --git a/bun.lock b/bun.lock
index 15c81f9..bf466e0 100644
--- a/bun.lock
+++ b/bun.lock
@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "raidguild-website",
@@ -30,7 +31,6 @@
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "cmdk": "^1.1.1",
-        "fathom-client": "^3.7.2",
         "lucide-react": "^0.545.0",
         "next": "15.5.7",
         "next-themes": "^0.4.6",
@@ -579,8 +579,6 @@
 
     "fastq": ["fastq@1.19.1", "", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ=="],
 
-    "fathom-client": ["fathom-client@3.7.2", "", {}, "sha512-sWtaNivhg7uwp/q1bUuIiNj4LeQZMEZ5NXXFFpZ8le4uDedAfQG84gPOdYehtVXbl+1yX2s8lmXZ2+IQ9a/xxA=="],
-
     "fdir": ["fdir@6.5.0", "", { "peerDependencies": { "picomatch": "^3 || ^4" } }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="],
 
     "file-entry-cache": ["file-entry-cache@8.0.0", "", { "dependencies": { "flat-cache": "^4.0.0" } }, "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ=="],
diff --git a/package.json b/package.json
index 105ef14..9d3a0d5 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,6 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
-    "fathom-client": "^3.7.2",
     "lucide-react": "^0.545.0",
     "next": "15.5.7",
     "next-themes": "^0.4.6",
diff --git a/public/witch/index.html b/public/witch/index.html
index 2446a66..5b05b87 100644
--- a/public/witch/index.html
+++ b/public/witch/index.html
@@ -171,13 +171,6 @@
             (n.className += t + "touch");
       })(window, document);
     </script>
-    <!-- Fathom - beautiful, simple website analytics disable - use the fathom component instead -->
-    <!-- <script
-      src="https://cdn.usefathom.com/script.js"
-      data-site="ASGWDEGI"
-      defer
-    ></script> -->
-    <!-- / Fathom -->
     <link href="images/favicon.png" rel="shortcut icon" type="image/x-icon" />
     <link href="images/webclip.png" rel="apple-touch-icon" />
     <style>
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 769a722..2cf2315 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,7 +3,6 @@ import { maziusDisplay, ebGaramond, ubuntuMono } from "@/lib/fonts";
 import "./globals.css";
 // import { ThemeProvider } from "next-themes";
 import { Providers } from "@/providers/providers";
-import Fathom from "@/components/Fathom";
 import VercelAnalytics from "@/components/VercelAnalytics";
 
 export const metadata: Metadata = {
@@ -21,7 +20,6 @@ export default function RootLayout({
       <body
         className={`${maziusDisplay.variable} ${ebGaramond.variable} ${ubuntuMono.variable} antialiased`}
       >
-        <Fathom />
         <VercelAnalytics />
         {/* <ThemeProvider
           attribute="class"
diff --git a/src/components/CohortHero.tsx b/src/components/CohortHero.tsx
index 7673d61..6c23a05 100644
--- a/src/components/CohortHero.tsx
+++ b/src/components/CohortHero.tsx
@@ -3,8 +3,8 @@
 import Image from "next/image";
 import { useState } from "react";
 import { Input } from "./ui/input";
-import { trackEvent } from "fathom-client";
 import { Button } from "./ui/button";
+import { analyticsEvents, trackAnalyticsEvent } from "@/lib/analytics";
 
 const cohortImages = [
   "/images/cohort-image-1-bw.webp",
@@ -53,7 +53,9 @@ export default function CohortHero({ referral }: JoinUsProps) {
 
       if (response.ok) {
         setSubmissionStatus("success");
-        trackEvent("cohort-hero-email-signup");
+        trackAnalyticsEvent(analyticsEvents.cohortHeroEmailSignup, {
+          hasReferral: Boolean(referral),
+        });
         setEmail("");
       } else {
         setSubmissionStatus("error");
diff --git a/src/components/Fathom.tsx b/src/components/Fathom.tsx
deleted file mode 100644
index d4cf0d7..0000000
--- a/src/components/Fathom.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-// Fathom.tsx
-"use client";
-
-import { load, trackEvent, trackPageview } from "fathom-client";
-import { useEffect, Suspense, useState } from "react";
-import { usePathname, useSearchParams } from "next/navigation";
-
-const FATHOM_ID = "ASGWDEGI";
-
-function TrackPageView() {
-  const pathname = usePathname();
-  const searchParams = useSearchParams();
-  const [isLoaded, setIsLoaded] = useState(false);
-
-  // Load the Fathom script on mount
-  useEffect(() => {
-    load(FATHOM_ID, {
-      auto: false,
-    });
-    setIsLoaded(true);
-  }, []);
-
-  // Record a pageview when route changes
-  useEffect(() => {
-    if (!pathname) return;
-
-    trackPageview({
-      url: pathname + searchParams?.toString(),
-      referrer: document.referrer,
-    });
-  }, [pathname, searchParams]);
-
-  // Set up link listeners
-  useEffect(() => {
-    if (!isLoaded) return;
-
-    document.querySelectorAll("[data-click]").forEach((item) => {
-      item.addEventListener("click", () => {
-        const tag = item.getAttribute("data-click");
-        console.log("tag", tag);
-        trackEvent(`link: ${tag}`);
-      });
-    });
-  }, [isLoaded]);
-
-  return null;
-}
-
-export default function Fathom() {
-  return (
-    <Suspense fallback={null}>
-      <TrackPageView />
-    </Suspense>
-  );
-}
diff --git a/src/components/HireUs.tsx b/src/components/HireUs.tsx
index 6ff4075..aedf5ee 100644
--- a/src/components/HireUs.tsx
+++ b/src/components/HireUs.tsx
@@ -40,7 +40,6 @@ import {
 import Image from "next/image";
 import MultipleSelector, { type Option } from "./ui/multiselect";
 import { DISCORD_INVITE_URL } from "@/lib/data/constants";
-import { trackEvent } from "fathom-client";
 import { analyticsEvents, trackAnalyticsEvent } from "@/lib/analytics";
 
 interface StepProps {
@@ -471,7 +470,6 @@ export default function HireUs() {
     setValidationErrors([]);
 
     //tracking
-    trackEvent("hire-us-submission");
     trackAnalyticsEvent(analyticsEvents.hireFormSubmitAttempt, {
       budget: formData.budget,
       servicesCount,
@@ -496,7 +494,6 @@ export default function HireUs() {
         setSubmissionStatus("success");
 
         //tracking
-        trackEvent("hire-us-submission");
         trackAnalyticsEvent(analyticsEvents.hireFormSubmitSuccess, {
           budget: formData.budget,
           servicesCount,
@@ -624,7 +621,6 @@ export default function HireUs() {
       component: <PersonalInfoStep form={form} />,
       validation: validatePersonalInfo,
       onStepComplete: () => {
-        trackEvent("hire-us-step-1");
         trackAnalyticsEvent(analyticsEvents.hireFormStepCompleted, {
           step: "contact_info",
           stepNumber: 1,
@@ -638,7 +634,6 @@ export default function HireUs() {
       component: <ProjectDetailsStep form={form} />,
       validation: validateProjectDetails,
       onStepComplete: () => {
-        trackEvent("hire-us-step-2");
         trackAnalyticsEvent(analyticsEvents.hireFormStepCompleted, {
           step: "project_details",
           stepNumber: 2,
diff --git a/src/components/JoinUs.tsx b/src/components/JoinUs.tsx
index 46b6760..c48b1ed 100644
--- a/src/components/JoinUs.tsx
+++ b/src/components/JoinUs.tsx
@@ -15,7 +15,6 @@ import {
 } from "@/components/ui/form";
 import { joinUsFormSchema, type JoinUsFormData } from "@/lib/validation";
 import Image from "next/image";
-import { trackEvent } from "fathom-client";
 import { Button } from "./ui/button";
 import { analyticsEvents, trackAnalyticsEvent } from "@/lib/analytics";
 
@@ -79,7 +78,6 @@ export default function JoinUs({ referral }: JoinUsProps) {
         setSubmissionStatus("success");
 
         //tracking
-        trackEvent("join-us-submission");
         trackAnalyticsEvent(analyticsEvents.joinSignupSuccess, {
           hasReferral: Boolean(referral),
         });
diff --git a/src/lib/analytics.ts b/src/lib/analytics.ts
index a14cd15..a87bfe3 100644
--- a/src/lib/analytics.ts
+++ b/src/lib/analytics.ts
@@ -14,6 +14,8 @@ export const analyticsEvents = {
   joinSignupAttempt: "Join Signup Attempt",
   joinSignupSuccess: "Join Signup Success",
   joinSignupError: "Join Signup Error",
+  cohortHeroEmailSignup: "Cohort Hero Email Signup",
+  witchTriggered: "Witch Triggered",
 } as const;
 
 export function trackAnalyticsEvent(
@@ -28,4 +30,3 @@ export function trackAnalyticsEvent(
     }
   }
 }
-
diff --git a/src/providers/providers.tsx b/src/providers/providers.tsx
index 8836fee..064bfd9 100644
--- a/src/providers/providers.tsx
+++ b/src/providers/providers.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect, useRef, useState } from "react";
 import { useRouter } from "next/navigation";
-import { trackEvent } from "fathom-client";
+import { analyticsEvents, trackAnalyticsEvent } from "@/lib/analytics";
 
 interface Drip {
   id: number;
@@ -181,7 +181,9 @@ function useLegacy() {
       // Check if the trigger word was typed
       if (newTyped.includes(triggerWord.toLowerCase())) {
         setIsTriggered(true);
-        trackEvent("witch");
+        trackAnalyticsEvent(analyticsEvents.witchTriggered, {
+          method: "keyboard",
+        });
         setTypedKeys("");
 
         // Wait for animation to complete before routing
@@ -204,7 +206,9 @@ function useLegacy() {
 
       if (sequenceRef.current.join(",") === pattern.join(",")) {
         setIsTriggered(true);
-        trackEvent("witch");
+        trackAnalyticsEvent(analyticsEvents.witchTriggered, {
+          method: "click_pattern",
+        });
         sequenceRef.current = [];
 
         setTimeout(() => {
