diff --git a/apps/docs/components/themes/templates/coffee.ts b/apps/docs/components/themes/templates/coffee.ts
index 798fa574c3..55afd40eef 100644
--- a/apps/docs/components/themes/templates/coffee.ts
+++ b/apps/docs/components/themes/templates/coffee.ts
@@ -4,6 +4,7 @@ import {initialLayout} from "../constants";
 import {Config} from "../types";
 
 export const coffee: Config = {
+  name: "coffee",
   light: {
     defaultColor: {
       default: "#b4afa8",
diff --git a/apps/docs/components/themes/templates/elegant.ts b/apps/docs/components/themes/templates/elegant.ts
index 42cbe5799f..f0cc802644 100644
--- a/apps/docs/components/themes/templates/elegant.ts
+++ b/apps/docs/components/themes/templates/elegant.ts
@@ -4,6 +4,7 @@ import {initialLayout} from "../constants";
 import {Config} from "../types";
 
 export const elegant: Config = {
+  name: "elegant",
   light: {
     defaultColor: {
       default: "#8f8f8f",
diff --git a/apps/docs/components/themes/templates/emerald.ts b/apps/docs/components/themes/templates/emerald.ts
index 748edb86a3..d705bd1d71 100644
--- a/apps/docs/components/themes/templates/emerald.ts
+++ b/apps/docs/components/themes/templates/emerald.ts
@@ -2,6 +2,7 @@ import {initialDarkTheme, initialLayout, initialLightTheme} from "../constants";
 import {Config} from "../types";
 
 export const emerald: Config = {
+  name: "emerald",
   light: {
     defaultColor: {
       default: "#b9c9be",
diff --git a/apps/docs/components/themes/templates/heroui.ts b/apps/docs/components/themes/templates/heroui.ts
index 7a63f5ee78..528072c6d5 100644
--- a/apps/docs/components/themes/templates/heroui.ts
+++ b/apps/docs/components/themes/templates/heroui.ts
@@ -2,6 +2,7 @@ import {initialDarkTheme, initialLayout, initialLightTheme} from "../constants";
 import {Config} from "../types";
 
 export const heroui: Config = {
+  name: "heroui",
   light: initialLightTheme,
   dark: initialDarkTheme,
   layout: initialLayout,
diff --git a/apps/docs/components/themes/templates/modern.ts b/apps/docs/components/themes/templates/modern.ts
index 474b1ccf3d..c409086854 100644
--- a/apps/docs/components/themes/templates/modern.ts
+++ b/apps/docs/components/themes/templates/modern.ts
@@ -4,6 +4,7 @@ import {initialLayout} from "../constants";
 import {Config} from "../types";
 
 export const modern: Config = {
+  name: "modern",
   light: {
     defaultColor: {
       default: "#897cc5",
diff --git a/apps/docs/components/themes/templates/retro.ts b/apps/docs/components/themes/templates/retro.ts
index dfb3acfd8c..b672e68e32 100644
--- a/apps/docs/components/themes/templates/retro.ts
+++ b/apps/docs/components/themes/templates/retro.ts
@@ -4,6 +4,7 @@ import {initialLayout} from "../constants";
 import {Config} from "../types";
 
 export const retro: Config = {
+  name: "retro",
   light: {
     defaultColor: {
       default: "#ffcf77",
diff --git a/package.json b/package.json
index fd01794186..cf4a33f2f3 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
     "shelljs": "^0.8.4",
     "tsup": "8.3.5",
     "tsx": "^4.19.2",
-    "turbo": "1.6.3",
+    "turbo": "2.4.4",
     "typescript": "^5.7.3",
     "webpack": "^5.53.0",
     "webpack-bundle-analyzer": "^4.4.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e983a03f33..73069a0fb1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -245,8 +245,8 @@ importers:
         specifier: ^4.19.2
         version: 4.19.2
       turbo:
-        specifier: 1.6.3
-        version: 1.6.3
+        specifier: 2.4.4
+        version: 2.4.4
       typescript:
         specifier: ^5.7.3
         version: 5.7.3
@@ -14901,38 +14901,38 @@ packages:
   tunnel-agent@0.6.0:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
 
-  turbo-darwin-64@1.6.3:
-    resolution: {integrity: sha512-QmDIX0Yh1wYQl0bUS0gGWwNxpJwrzZU2GIAYt3aOKoirWA2ecnyb3R6ludcS1znfNV2MfunP+l8E3ncxUHwtjA==}
+  turbo-darwin-64@2.4.4:
+    resolution: {integrity: sha512-5kPvRkLAfmWI0MH96D+/THnDMGXlFNmjeqNRj5grLKiry+M9pKj3pRuScddAXPdlxjO5Ptz06UNaOQrrYGTx1g==}
     cpu: [x64]
     os: [darwin]
 
-  turbo-darwin-arm64@1.6.3:
-    resolution: {integrity: sha512-75DXhFpwE7CinBbtxTxH08EcWrxYSPFow3NaeFwsG8aymkWXF+U2aukYHJA6I12n9/dGqf7yRXzkF0S/9UtdyQ==}
+  turbo-darwin-arm64@2.4.4:
+    resolution: {integrity: sha512-/gtHPqbGQXDFhrmy+Q/MFW2HUTUlThJ97WLLSe4bxkDrKHecDYhAjbZ4rN3MM93RV9STQb3Tqy4pZBtsd4DfCw==}
     cpu: [arm64]
     os: [darwin]
 
-  turbo-linux-64@1.6.3:
-    resolution: {integrity: sha512-O9uc6J0yoRPWdPg9THRQi69K6E2iZ98cRHNvus05lZbcPzZTxJYkYGb5iagCmCW/pq6fL4T4oLWAd6evg2LGQA==}
+  turbo-linux-64@2.4.4:
+    resolution: {integrity: sha512-SR0gri4k0bda56hw5u9VgDXLKb1Q+jrw4lM7WAhnNdXvVoep4d6LmnzgMHQQR12Wxl3KyWPbkz9d1whL6NTm2Q==}
     cpu: [x64]
     os: [linux]
 
-  turbo-linux-arm64@1.6.3:
-    resolution: {integrity: sha512-dCy667qqEtZIhulsRTe8hhWQNCJO0i20uHXv7KjLHuFZGCeMbWxB8rsneRoY+blf8+QNqGuXQJxak7ayjHLxiA==}
+  turbo-linux-arm64@2.4.4:
+    resolution: {integrity: sha512-COXXwzRd3vslQIfJhXUklgEqlwq35uFUZ7hnN+AUyXx7hUOLIiD5NblL+ETrHnhY4TzWszrbwUMfe2BYWtaPQg==}
     cpu: [arm64]
     os: [linux]
 
-  turbo-windows-64@1.6.3:
-    resolution: {integrity: sha512-lKRqwL3mrVF09b9KySSaOwetehmGknV9EcQTF7d2dxngGYYX1WXoQLjFP9YYH8ZV07oPm+RUOAKSCQuDuMNhiA==}
+  turbo-windows-64@2.4.4:
+    resolution: {integrity: sha512-PV9rYNouGz4Ff3fd6sIfQy5L7HT9a4fcZoEv8PKRavU9O75G7PoDtm8scpHU10QnK0QQNLbE9qNxOAeRvF0fJg==}
     cpu: [x64]
     os: [win32]
 
-  turbo-windows-arm64@1.6.3:
-    resolution: {integrity: sha512-BXY1sDPEA1DgPwuENvDCD8B7Hb0toscjus941WpL8CVd10hg9pk/MWn9CNgwDO5Q9ks0mw+liDv2EMnleEjeNA==}
+  turbo-windows-arm64@2.4.4:
+    resolution: {integrity: sha512-403sqp9t5sx6YGEC32IfZTVWkRAixOQomGYB8kEc6ZD+//LirSxzeCHCnM8EmSXw7l57U1G+Fb0kxgTcKPU/Lg==}
     cpu: [arm64]
     os: [win32]
 
-  turbo@1.6.3:
-    resolution: {integrity: sha512-FtfhJLmEEtHveGxW4Ye/QuY85AnZ2ZNVgkTBswoap7UMHB1+oI4diHPNyqrQLG4K1UFtCkjOlVoLsllUh/9QRw==}
+  turbo@2.4.4:
+    resolution: {integrity: sha512-N9FDOVaY3yz0YCOhYIgOGYad7+m2ptvinXygw27WPLQvcZDl3+0Sa77KGVlLSiuPDChOUEnTKE9VJwLSi9BPGQ==}
     hasBin: true
 
   typanion@3.14.0:
@@ -29227,32 +29227,32 @@ snapshots:
     dependencies:
       safe-buffer: 5.2.1
 
-  turbo-darwin-64@1.6.3:
+  turbo-darwin-64@2.4.4:
     optional: true
 
-  turbo-darwin-arm64@1.6.3:
+  turbo-darwin-arm64@2.4.4:
     optional: true
 
-  turbo-linux-64@1.6.3:
+  turbo-linux-64@2.4.4:
     optional: true
 
-  turbo-linux-arm64@1.6.3:
+  turbo-linux-arm64@2.4.4:
     optional: true
 
-  turbo-windows-64@1.6.3:
+  turbo-windows-64@2.4.4:
     optional: true
 
-  turbo-windows-arm64@1.6.3:
+  turbo-windows-arm64@2.4.4:
     optional: true
 
-  turbo@1.6.3:
+  turbo@2.4.4:
     optionalDependencies:
-      turbo-darwin-64: 1.6.3
-      turbo-darwin-arm64: 1.6.3
-      turbo-linux-64: 1.6.3
-      turbo-linux-arm64: 1.6.3
-      turbo-windows-64: 1.6.3
-      turbo-windows-arm64: 1.6.3
+      turbo-darwin-64: 2.4.4
+      turbo-darwin-arm64: 2.4.4
+      turbo-linux-64: 2.4.4
+      turbo-linux-arm64: 2.4.4
+      turbo-windows-64: 2.4.4
+      turbo-windows-arm64: 2.4.4
 
   typanion@3.14.0: {}
 
diff --git a/turbo.json b/turbo.json
index 1596b939a2..2f310e89a1 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,8 +1,7 @@
 {
   "$schema": "https://turbo.build/schema.json",
-  "baseBranch": "origin/main",
   "globalDependencies": ["tsconfig.json"],
-  "pipeline": {
+  "tasks": {
     "build": {
       "dependsOn": ["^build"],
       "outputs": [".next/**", "dist/**", "lib/**", "storybook-static/**"]