diff --git a/docs/site/app/(no-sidebar)/page.tsx b/docs/site/app/(no-sidebar)/page.tsx
index 6788a0e23d290..66efddcc7da1e 100644
--- a/docs/site/app/(no-sidebar)/page.tsx
+++ b/docs/site/app/(no-sidebar)/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import React, { useState } from "react";
-import cn from "classnames";
+import { cn } from "@/components/cn";
 import Link from "next/link";
 import { motion } from "framer-motion";
 import { Clients } from "@/app/_clients/clients";
diff --git a/docs/site/app/(no-sidebar)/showcase/page.tsx b/docs/site/app/(no-sidebar)/showcase/page.tsx
index e084aa0e9d891..fafe4ab157c1d 100644
--- a/docs/site/app/(no-sidebar)/showcase/page.tsx
+++ b/docs/site/app/(no-sidebar)/showcase/page.tsx
@@ -16,16 +16,16 @@ function Showcase(): JSX.Element {
     <main className="container mx-auto pt-12">
       <div className="mx-auto">
         <div className="py-16 lg:text-center">
-          <h1 className="mt-2 text-3xl font-extrabold leading-8 tracking-tight text-gray-900 dark:text-white sm:text-4xl sm:leading-10 md:text-5xl">
+          <h1 className="mt-2 text-3xl font-extrabold leading-8 tracking-tight text-black dark:text-white sm:text-4xl sm:leading-10 md:text-5xl">
             Showcase
           </h1>
-          <p className="mt-4 max-w-3xl font-mono text-xl leading-7 text-gray-900 dark:text-gray-900 lg:mx-auto">
+          <p className="mt-4 max-w-3xl font-mono text-xl leading-7 text-black dark:text-white lg:mx-auto">
             Who is using Turborepo?
           </p>
         </div>
       </div>
 
-      <div className="mb-8 px-0 sm:px-8  grid grid-cols-3 items-center gap-16 sm:grid-cols-4 md:grid-cols-5 lg:grid-cols-6 xl:grid-cols-7 ">
+      <div className="mb-8 px-0 min-h-screen sm:px-8 grid grid-cols-3 items-center gap-16 sm:grid-cols-4 md:grid-cols-5 lg:grid-cols-6 xl:grid-cols-7 ">
         <Clients linked />
       </div>
     </main>
diff --git a/docs/site/app/_clients/client-logo.tsx b/docs/site/app/_clients/client-logo.tsx
index 97de40f4a48b9..3a966a95254f6 100644
--- a/docs/site/app/_clients/client-logo.tsx
+++ b/docs/site/app/_clients/client-logo.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import cn from "classnames";
+import { cn } from "@/components/cn";
 import Image from "next/image";
 import type { TurboUser } from "./users";
 
@@ -12,10 +12,12 @@ export function Logo({
   user,
   theme,
   isLink,
+  className,
 }: {
   user: TurboUser;
   theme: "dark" | "light";
   isLink: boolean;
+  className?: string;
 }): JSX.Element {
   const styles = {
     ...DEFAULT_SIZE,
@@ -32,10 +34,7 @@ export function Logo({
   const logo = (
     <Image
       alt={`${user.caption}'s Logo`}
-      className={cn("mx-8", {
-        "hidden dark:inline": theme !== "dark",
-        "inline dark:hidden": theme === "dark",
-      })}
+      className={cn("mx-8", className)}
       // biome-ignore lint/style/noNonNullAssertion: Ignored using `--suppress`
       height={numericHeight!}
       priority
@@ -52,10 +51,7 @@ export function Logo({
   if (isLink) {
     return (
       <a
-        className={cn("item-center flex justify-center", {
-          "hidden dark:flex": theme !== "dark",
-          "flex dark:hidden": theme === "dark",
-        })}
+        className="item-center flex justify-center"
         href={user.infoLink}
         rel="noopener noreferrer"
         target="_blank"
diff --git a/docs/site/app/_clients/clients.tsx b/docs/site/app/_clients/clients.tsx
index 8abecc00a5a20..30bc4d7e68b0f 100644
--- a/docs/site/app/_clients/clients.tsx
+++ b/docs/site/app/_clients/clients.tsx
@@ -1,20 +1,19 @@
-import type { ReactElement, JSX } from "react";
-import React from "react";
-import cn from "classnames";
+"use client";
+
+import type { ReactElement } from "react";
+import React, { useEffect, useState } from "react";
+import { cn } from "@/components/cn";
 import { users } from "./users";
 import { Logo } from "./client-logo";
+import { useTheme } from "next-themes";
 
 interface LogoWrapperProps {
   className: string;
-  children: JSX.Element;
+  children: ReactElement;
   staticWidth?: boolean;
 }
 
-function LogoWrapper({
-  className,
-  children,
-  staticWidth,
-}: LogoWrapperProps): JSX.Element {
+function LogoWrapper({ className, children, staticWidth }: LogoWrapperProps) {
   if (!staticWidth) return children;
   return (
     <div
@@ -33,39 +32,36 @@ export function Clients({
   linked?: boolean;
   staticWidth?: boolean;
   companyList?: string[];
-}): JSX.Element {
-  const showcaseDark: ReactElement[] = [];
-  const showcaseLight: ReactElement[] = [];
+}) {
+  const [mounted, setMounted] = useState(false);
+  const { theme } = useTheme();
+
+  useEffect(() => {
+    setMounted(true);
+  }, []);
+
+  // avoid hydration errors
+  if (!mounted) return null;
 
-  users
+  return users
     .filter((i) => (companyList ? companyList.includes(i.caption) : true))
-    .forEach((user) => {
-      if (user.pinned) {
-        showcaseDark.push(
-          <LogoWrapper
-            className="flex dark:hidden"
-            key={`${user.caption}-dark`}
-            staticWidth={staticWidth}
-          >
-            <Logo isLink={linked ?? false} theme="dark" user={user} />
-          </LogoWrapper>
-        );
-        showcaseLight.push(
-          <LogoWrapper
-            className="hidden dark:flex"
-            key={`${user.caption}-light`}
-            staticWidth={staticWidth}
-          >
-            <Logo isLink={linked ?? false} theme="light" user={user} />
-          </LogoWrapper>
-        );
-      }
-    });
+    .map((user) => {
+      const isDark = theme === "dark";
+      const imgTheme = isDark ? "light" : "dark";
 
-  return (
-    <>
-      {showcaseDark}
-      {showcaseLight}
-    </>
-  );
+      return (
+        <LogoWrapper
+          className={isDark ? "hidden dark:flex" : "dark:hidden flex"}
+          key={`${user.caption}-${imgTheme}`}
+          staticWidth={staticWidth}
+        >
+          <Logo
+            className={isDark ? "hidden dark:flex" : "dark:hidden flex"}
+            isLink={linked ?? false}
+            theme={imgTheme}
+            user={user}
+          />
+        </LogoWrapper>
+      );
+    });
 }
diff --git a/docs/site/app/_components/footer.tsx b/docs/site/app/_components/footer.tsx
index 080c555418b0d..e6d02553bb8ad 100644
--- a/docs/site/app/_components/footer.tsx
+++ b/docs/site/app/_components/footer.tsx
@@ -4,7 +4,7 @@ import { useRouter } from "next/navigation";
 import Link from "next/link";
 import type { ReactNode, ReactElement } from "react";
 import { useState } from "react";
-import cn from "classnames";
+import { cn } from "@/components/cn";
 import { VercelLogo } from "./logos";
 import { gitHubRepoUrl } from "@/lib/constants";
 
diff --git a/docs/site/app/_components/logo-context.tsx b/docs/site/app/_components/logo-context.tsx
index aa6aed91a7136..93afde0899edd 100644
--- a/docs/site/app/_components/logo-context.tsx
+++ b/docs/site/app/_components/logo-context.tsx
@@ -3,7 +3,7 @@
 import type { MouseEvent } from "react";
 import { useEffect, useCallback, useState, useRef } from "react";
 import Link from "next/link";
-import classNames from "classnames";
+import { cn } from "@/components/cn";
 import { VercelLogo } from "./logos";
 import { PRODUCT_MENU_ITEMS, PLATFORM_MENU_ITEMS } from "./items";
 import type { MenuItemProps } from "./types";
@@ -17,9 +17,7 @@ function MenuDivider({
 }): JSX.Element {
   return (
     <h3
-      className={classNames(
-        "group flex items-center px-4 py-2 text-xs font-bold text-gray-500 dark:text-gray-600"
-      )}
+      className="group flex items-center px-4 py-2 text-xs font-bold text-gray-500 dark:text-gray-600"
       {...other}
     >
       {children}
@@ -63,7 +61,7 @@ function MenuItem({
     }
   }, [copied, closeMenu]);
 
-  const classes = classNames(
+  const classes = cn(
     className,
     "group flex items-center px-4 py-2 text-sm dark:hover:bg-gray-800 hover:bg-gray-200 w-full rounded-md"
   );
@@ -170,7 +168,7 @@ export function LogoContext(): JSX.Element {
               </MenuItem>
             ))}
             <MenuDivider>Products</MenuDivider>
-            {PRODUCT_MENU_ITEMS({ theme }).map((item) => (
+            {PRODUCT_MENU_ITEMS().map((item) => (
               <MenuItem
                 closeMenu={() => {
                   setOpen(false);
diff --git a/docs/site/app/_components/logos.tsx b/docs/site/app/_components/logos.tsx
index 10ccca13ca480..615b048be1899 100644
--- a/docs/site/app/_components/logos.tsx
+++ b/docs/site/app/_components/logos.tsx
@@ -1,9 +1,9 @@
-import classNames from "classnames";
+import { cn } from "@/components/cn";
 
 export function VercelLogo({ className }: { className?: string }): JSX.Element {
   return (
     <svg
-      className={classNames(className, "fill-black dark:fill-white")}
+      className={cn(className, "fill-black dark:fill-white")}
       fill="none"
       height={22}
       viewBox="0 0 235 203"
diff --git a/docs/site/app/_components/turbohero-background.tsx b/docs/site/app/_components/turbohero-background.tsx
index 89ddd01f49ec5..9714e12acfa7a 100644
--- a/docs/site/app/_components/turbohero-background.tsx
+++ b/docs/site/app/_components/turbohero-background.tsx
@@ -1,4 +1,4 @@
-import cn from "classnames";
+import { cn } from "@/components/cn";
 import type { JSX } from "react";
 import styles from "./turbohero-background.module.css";
 
diff --git a/docs/site/components/authors.tsx b/docs/site/components/authors.tsx
index ecb6297b96570..df64870ec89fd 100644
--- a/docs/site/components/authors.tsx
+++ b/docs/site/components/authors.tsx
@@ -1,4 +1,4 @@
-import cn from "classnames";
+import { cn } from "@/components/cn";
 import { TURBO_TEAM } from "./team";
 import type { Author } from "./team";
 import { Avatar } from "./avatar";
diff --git a/docs/site/components/badge.tsx b/docs/site/components/badge.tsx
index b991c1e284c4c..f44bc37334d27 100644
--- a/docs/site/components/badge.tsx
+++ b/docs/site/components/badge.tsx
@@ -1,4 +1,4 @@
-import cn from "classnames";
+import { cn } from "@/components/cn";
 import type { ReactNode } from "react";
 
 export type BadgeProps = React.ComponentProps<"span"> & {
diff --git a/docs/site/components/files.tsx b/docs/site/components/files.tsx
index 30da4b2581a81..a4dd05a7d9d5c 100644
--- a/docs/site/components/files.tsx
+++ b/docs/site/components/files.tsx
@@ -1,4 +1,4 @@
-import classNames from "classnames";
+import { cn } from "@/components/cn";
 import {
   File as FumaFile,
   Folder as FumaFolder,
@@ -18,9 +18,10 @@ export function File({
 }): JSX.Element {
   return (
     <FumaFile
-      className={`${classNames({
-        "text-green-700 dark:text-green-900": green,
-      })} ${className}`}
+      className={cn(
+        green ? "text-green-700 dark:text-green-900" : "",
+        className
+      )}
       name={name}
       {...props}
     />
@@ -39,9 +40,10 @@ export function Folder({
 }): JSX.Element {
   return (
     <FumaFolder
-      className={`${classNames({
-        "text-green-700 dark:text-green-900": green,
-      })} ${className}`}
+      className={cn(
+        green ? "text-green-700 dark:text-green-900" : "",
+        className
+      )}
       name={name}
       {...props}
     />
diff --git a/docs/site/components/image/themed-image-figure.tsx b/docs/site/components/image/themed-image-figure.tsx
index c44761973e7da..2c8ed22c021dd 100644
--- a/docs/site/components/image/themed-image-figure.tsx
+++ b/docs/site/components/image/themed-image-figure.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import cn from "classnames";
+import { cn } from "@/components/cn";
 import type { ImageFigureProps } from "./image-figure";
 import type { ThemedImageProps } from "./themed-image";
 import { ThemedImage } from "./themed-image";
@@ -27,10 +27,8 @@ export function ThemedImageFigure(
       <div
         className={cn(
           "border-box relative inline-block max-w-full overflow-hidden text-[0px]",
-          {
-            "rounded-md": borderRadius,
-            "shadow-lg": shadow,
-          }
+          borderRadius ? "rounded-md" : "",
+          shadow ? "shadow-lg" : ""
         )}
       >
         {}
diff --git a/docs/site/components/theme-aware-image.tsx b/docs/site/components/theme-aware-image.tsx
index 0ec9c0fae4e74..173ab1f0c73a3 100644
--- a/docs/site/components/theme-aware-image.tsx
+++ b/docs/site/components/theme-aware-image.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import cn from "classnames";
+import { cn } from "@/components/cn";
 import type { ImageProps } from "next/image";
 import Image from "next/image";
 
diff --git a/docs/site/package.json b/docs/site/package.json
index abfe2743ae890..7be37fd9dc748 100644
--- a/docs/site/package.json
+++ b/docs/site/package.json
@@ -34,7 +34,6 @@
     "@vercel/speed-insights": "1.2.0",
     "algoliasearch": "^4.23.3",
     "class-variance-authority": "^0.7.1",
-    "classnames": "^2.5.1",
     "clsx": "^2.1.1",
     "copy-to-clipboard": "^3.3.3",
     "fast-glob": "^3.3.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f213f55239df5..4b0f9c46cff3c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -139,9 +139,6 @@ importers:
       class-variance-authority:
         specifier: ^0.7.1
         version: 0.7.1
-      classnames:
-        specifier: ^2.5.1
-        version: 2.5.1
       clsx:
         specifier: ^2.1.1
         version: 2.1.1
@@ -7140,10 +7137,6 @@ packages:
       clsx: 2.1.1
     dev: false
 
-  /classnames@2.5.1:
-    resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==}
-    dev: false
-
   /clean-css@5.3.3:
     resolution: {integrity: sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==}
     engines: {node: '>= 10.0'}