diff --git a/apps/client/app/components/ui/code-block.tsx b/apps/client/app/components/ui/code-block.tsx
index b8b9210..1ae2ce5 100644
--- a/apps/client/app/components/ui/code-block.tsx
+++ b/apps/client/app/components/ui/code-block.tsx
@@ -1,8 +1,4 @@
-import Prism from "prismjs";
 import type React from "react";
-import { useEffect } from "react";
-import "prismjs/themes/prism-okaidia.css";
-import "prismjs/components/prism-yaml";
 import { toast } from "sonner";
 import { copyToClipboard } from "~/utils/clipboard";
 
@@ -12,11 +8,7 @@ interface CodeBlockProps {
 	filename?: string;
 }
 
-export const CodeBlock: React.FC<CodeBlockProps> = ({ code, language = "jsx", filename }) => {
-	useEffect(() => {
-		Prism.highlightAll();
-	}, []);
-
+export const CodeBlock: React.FC<CodeBlockProps> = ({ code, filename }) => {
 	const handleCopy = async () => {
 		await copyToClipboard(code);
 		toast.success("Code copied to clipboard");
@@ -29,7 +21,7 @@ export const CodeBlock: React.FC<CodeBlockProps> = ({ code, language = "jsx", fi
 					<span className="h-2.5 w-2.5 rounded-full bg-rose-500" />
 					<span className="h-2.5 w-2.5 rounded-full bg-amber-500" />
 					<span className="h-2.5 w-2.5 rounded-full bg-emerald-500" />
-					{filename && <span className="ml-3 font-medium text-slate-300">{filename}</span>}
+					{filename && <span className="ml-3 font-medium">{filename}</span>}
 				</div>
 				<button
 					type="button"
@@ -39,8 +31,8 @@ export const CodeBlock: React.FC<CodeBlockProps> = ({ code, language = "jsx", fi
 					Copy
 				</button>
 			</div>
-			<pre className="overflow-x-auto text-xs m-0" style={{ marginTop: 0, borderRadius: 0, marginBottom: 0 }}>
-				<code className={`language-${language}`}>{code}</code>
+			<pre className="text-xs m-0 px-4 py-2 bg-card-header">
+				<code className="text-white/80">{code}</code>
 			</pre>
 		</div>
 	);
diff --git a/apps/client/package.json b/apps/client/package.json
index 853c9ea..39a3ae6 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -32,7 +32,6 @@
 		"isbot": "^5.1.31",
 		"lucide-react": "^0.544.0",
 		"next-themes": "^0.4.6",
-		"prismjs": "^1.30.0",
 		"react": "^19.2.0",
 		"react-dom": "^19.2.0",
 		"react-hook-form": "^7.63.0",
@@ -46,7 +45,6 @@
 		"@react-router/dev": "^7.9.3",
 		"@tailwindcss/vite": "^4.1.14",
 		"@types/node": "^24.6.2",
-		"@types/prismjs": "^1.26.5",
 		"@types/react": "^19.2.0",
 		"@types/react-dom": "^19.2.0",
 		"lightningcss": "^1.30.2",
diff --git a/bun.lock b/bun.lock
index 1d37d51..4aa7c18 100644
--- a/bun.lock
+++ b/bun.lock
@@ -34,7 +34,6 @@
         "isbot": "^5.1.31",
         "lucide-react": "^0.544.0",
         "next-themes": "^0.4.6",
-        "prismjs": "^1.30.0",
         "react": "^19.2.0",
         "react-dom": "^19.2.0",
         "react-hook-form": "^7.63.0",
@@ -48,7 +47,6 @@
         "@react-router/dev": "^7.9.3",
         "@tailwindcss/vite": "^4.1.14",
         "@types/node": "^24.6.2",
-        "@types/prismjs": "^1.26.5",
         "@types/react": "^19.2.0",
         "@types/react-dom": "^19.2.0",
         "lightningcss": "^1.30.2",
@@ -544,8 +542,6 @@
 
     "@types/node": ["@types/node@24.6.2", "", { "dependencies": { "undici-types": "~7.13.0" } }, "sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang=="],
 
-    "@types/prismjs": ["@types/prismjs@1.26.5", "", {}, "sha512-AUZTa7hQ2KY5L7AmtSiqxlhWxb4ina0yd8hNbl4TWuqnv/pFP0nDMb3YrfSBf4hJVGLh2YEIBfKaBW/9UEl6IQ=="],
-
     "@types/react": ["@types/react@19.2.0", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-1LOH8xovvsKsCBq1wnT4ntDUdCJKmnEakhsuoUSy6ExlHCkGP2hqnatagYTgFk6oeL0VU31u7SNjunPN+GchtA=="],
 
     "@types/react-dom": ["@types/react-dom@19.2.0", "", { "peerDependencies": { "@types/react": "^19.2.0" } }, "sha512-brtBs0MnE9SMx7px208g39lRmC5uHZs96caOJfTjFcYSLHNamvaSMfJNagChVNkup2SdtOxKX1FDBkRSJe1ZAg=="],
@@ -1034,8 +1030,6 @@
 
     "prettier": ["prettier@3.6.2", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ=="],
 
-    "prismjs": ["prismjs@1.30.0", "", {}, "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw=="],
-
     "proc-log": ["proc-log@3.0.0", "", {}, "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A=="],
 
     "promise-inflight": ["promise-inflight@1.0.1", "", {}, "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="],