diff --git a/src/modules/todos/components/todo-card.tsx b/src/modules/todos/components/todo-card.tsx
index 561ba94..db45442 100644
--- a/src/modules/todos/components/todo-card.tsx
+++ b/src/modules/todos/components/todo-card.tsx
@@ -68,13 +68,13 @@ export function TodoCard({ todo }: TodoCardProps) {
                         </div>
                         <div className="flex-1 min-w-0">
                             <h3
-                                className={`font-semibold text-lg leading-tight ${todo.completed ? "line-through text-gray-500" : ""}`}
+                                className={`font-semibold text-lg leading-tight ${todo.completed ? "line-through text-muted-foreground" : ""}`}
                             >
                                 {todo.title}
                             </h3>
                             {todo.description && (
                                 <p
-                                    className={`text-sm mt-1 ${todo.completed ? "text-gray-400" : "text-gray-600"}`}
+                                    className={`text-sm mt-1 ${todo.completed ? "text-muted-foreground/70" : "text-muted-foreground"}`}
                                 >
                                     {todo.description}
                                 </p>
@@ -120,7 +120,7 @@ export function TodoCard({ todo }: TodoCardProps) {
                         <Badge variant="secondary">{todo.categoryName}</Badge>
                     )}
                     {todo.imageUrl && (
-                        <Badge variant="outline" className="text-blue-600">
+                        <Badge variant="outline" className="text-primary">
                             <ImageIcon className="h-3 w-3 mr-1" />
                             Image
                         </Badge>
@@ -129,12 +129,12 @@ export function TodoCard({ todo }: TodoCardProps) {
 
                 {todo.dueDate && (
                     <div
-                        className={`flex items-center text-sm ${isOverdue ? "text-red-600" : "text-gray-500"}`}
+                        className={`flex items-center text-sm ${isOverdue ? "text-destructive" : "text-muted-foreground"}`}
                     >
                         <Calendar className="h-4 w-4 mr-1" />
                         Due: {formatDate(todo.dueDate)}
                         {isOverdue && (
-                            <span className="ml-2 text-red-600 font-semibold">
+                            <span className="ml-2 text-destructive font-semibold">
                                 (Overdue)
                             </span>
                         )}
diff --git a/src/modules/todos/todo-list.page.tsx b/src/modules/todos/todo-list.page.tsx
index 0939b82..e852a33 100644
--- a/src/modules/todos/todo-list.page.tsx
+++ b/src/modules/todos/todo-list.page.tsx
@@ -13,7 +13,7 @@ export default async function TodoListPage() {
             <div className="flex justify-between items-center mb-8 w-full">
                 <div>
                     <h1 className="text-3xl font-bold">Todos</h1>
-                    <p className="text-gray-600 mt-1">
+                    <p className="text-muted-foreground mt-1">
                         Manage your tasks and stay organized
                     </p>
                 </div>
@@ -27,11 +27,11 @@ export default async function TodoListPage() {
 
             {todos.length === 0 ? (
                 <div className="text-center py-12 w-full">
-                    <div className="text-gray-400 text-6xl mb-4">📝</div>
-                    <h3 className="text-xl font-semibold text-gray-600 mb-2">
+                    <div className="text-muted-foreground/40 text-6xl mb-4">📝</div>
+                    <h3 className="text-xl font-semibold text-muted-foreground mb-2">
                         No todos yet
                     </h3>
-                    <p className="text-gray-500 mb-6">
+                    <p className="text-muted-foreground/80 mb-6">
                         Create your first todo to get started
                     </p>
                     <Link href={todosRoutes.new}>