diff --git a/packages/shadcn/src/utils/create-project.ts b/packages/shadcn/src/utils/create-project.ts
index b6d27da4f7..a6f66dba71 100644
--- a/packages/shadcn/src/utils/create-project.ts
+++ b/packages/shadcn/src/utils/create-project.ts
@@ -28,7 +28,7 @@ export async function createProject(
 
   let projectType: "next" | "monorepo" = "next"
   let projectName: string = "my-app"
-  let nextVersion = "15.1.0"
+  let nextVersion = "canary"
 
   const isRemoteComponent =
     options.components?.length === 1 &&
@@ -159,7 +159,10 @@ async function createNextProject(
     `--use-${options.packageManager}`,
   ]
 
-  if (options.version.startsWith("15")) {
+  if (
+    options.version.startsWith("15") ||
+    options.version.startsWith("canary")
+  ) {
     args.push("--turbopack")
   }
 
diff --git a/packages/shadcn/src/utils/updaters/update-css-vars.ts b/packages/shadcn/src/utils/updaters/update-css-vars.ts
index c1335835f6..541036e3e4 100644
--- a/packages/shadcn/src/utils/updaters/update-css-vars.ts
+++ b/packages/shadcn/src/utils/updaters/update-css-vars.ts
@@ -457,7 +457,7 @@ function updateThemePlugin(cssVars: z.infer<typeof registryItemCssVarsSchema>) {
             }
             themeNode?.append(cssVarNode)
           }
-          break
+          continue
         }
 
         let prop =