diff --git a/frontend/components/editor/AIChat/ChatMessage.tsx b/frontend/components/editor/AIChat/ChatMessage.tsx
index 8e93c17..05a31bc 100644
--- a/frontend/components/editor/AIChat/ChatMessage.tsx
+++ b/frontend/components/editor/AIChat/ChatMessage.tsx
@@ -126,8 +126,8 @@ export default function ChatMessage({
       <div
         className={`relative p-2 rounded-lg ${
           message.role === "user"
-            ? "bg-[#262626] text-white"
-            : "bg-transparent text-white"
+            ? "bg-[#262626] text-foreground"
+            : "bg-transparent text-foreground"
         } max-w-full`}
       >
         {/* Render context tabs */}
@@ -171,7 +171,7 @@ export default function ChatMessage({
                             end: e.target.value.split("\n").length,
                           })
                         }}
-                        className="w-full p-2 bg-[#1e1e1e] text-white font-mono text-sm rounded"
+                        className="w-full p-2 bg-[#1e1e1e] text-foreground font-mono text-sm rounded"
                         rows={code.split("\n").length}
                         style={{
                           resize: "vertical",
diff --git a/frontend/components/editor/navbar/deploy.tsx b/frontend/components/editor/navbar/deploy.tsx
index c1a1f4f..c9e1666 100644
--- a/frontend/components/editor/navbar/deploy.tsx
+++ b/frontend/components/editor/navbar/deploy.tsx
@@ -75,7 +75,7 @@ export default function DeployButtonModal({
           </div>
           <Button
             variant="outline"
-            className="mt-4 w-full bg-[#0a0a0a] text-white hover:bg-[#262626]"
+            className="mt-4 w-full bg-[#0a0a0a] text-foreground hover:bg-[#262626]"
             onClick={handleDeploy}
           >
             {isDeploying ? "Deploying..." : isDeployed ? "Update" : "Deploy"}