improvement: badge & card components colour pallete updated so their text become more readable in light mode.

frontend/src/app/(dashboard)/billing/page.tsx

@@ -4,6 +4,7 @@ import { useState } from 'react';
 import { Pencil } from 'lucide-react';
 import { Button } from '@/components/ui/common/Button';
 import { Badge } from '@/components/ui/common/Badge';
+import { Card } from '@/components/ui/common/Card';
 import { Table } from '@/components/ui/common/Table';
 import { SearchBar } from '@/components/ui/common/SearchBar';
 import { useAuth } from '@/lib/hooks/useAuth';
@@ -195,19 +196,19 @@ export default function BillingPage() {
 }
 function StatCard({ title, count, amount, color }: StatCardProps) {
     const colors: Record<StatCardColor, string> = {
-        blue: 'bg-sky-900/30 text-sky-300 border-sky-700/60',
+        blue: '!bg-purpose-visit-bg !text-purpose-visit-fg !border-purpose-visit-border',
-        yellow: 'bg-amber-900/30 text-amber-300 border-amber-700/60',
+        yellow: '!bg-badge-warning-bg !text-badge-warning-fg !border-badge-warning-border',
-        green: 'bg-emerald-900/30 text-emerald-300 border-emerald-700/60',
+        green: '!bg-badge-success-bg !text-badge-success-fg !border-badge-success-border',
-        red: 'bg-red-950/30 text-red-300 border-red-700/60',
+        red: '!bg-badge-danger-bg !text-badge-danger-fg !border-badge-danger-border',
     };
 
     return (
-        <div className={`p-4 rounded-xl border ${colors[color]}`}>
+        <Card className={`${colors[color]}`}>
-            <p className="text-sm font-medium opacity-80">{title}</p>
+            <p className="text-sm font-medium">{title}</p>
             <p className="text-2xl font-bold mt-1">{count}</p>
             <p className="text-sm font-medium mt-1">
                 ${amount.toLocaleString()}
             </p>
-        </div>
+        </Card>
     );
 }

frontend/src/app/(dashboard)/today/page.tsx

@@ -2,6 +2,7 @@
 
 import Link from 'next/link';
 import { useAuth } from '@/lib/hooks/useAuth';
+import { Card } from '@/components/ui/common/Card';
 
 export default function TodayPage() {
   const { currentOrganization } = useAuth();
@@ -27,29 +28,26 @@ export default function TodayPage() {
       )}
 
       <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-4 gap-4">
-        <Card title="Today's Appointments" value="12" sub="Monday 2/5/2026" />
+        <Card>
-        <Card title="Active Patients" value="675" />
+          <p className="text-sm text-card-muted">Today's Appointments</p>
-        <Card title="New Lab Case" value="5" sub="35 ↑" />
+          <p className="text-2xl font-semibold mt-2">12</p>
-        <Card title="Today invoices" value="1200$" sub="21,300 $" />
+          <p className="text-xs text-text-muted mt-1">Monday 2/5/2026</p>
+        </Card>
+        <Card>
+          <p className="text-sm text-card-muted">Active Patients</p>
+          <p className="text-2xl font-semibold mt-2">675</p>
+        </Card>
+        <Card>
+          <p className="text-sm text-card-muted">New Lab Case</p>
+          <p className="text-2xl font-semibold mt-2">5</p>
+          <p className="text-xs text-text-muted mt-1">35 ↑</p>
+        </Card>
+        <Card>
+          <p className="text-sm text-card-muted">Today invoices</p>
+          <p className="text-2xl font-semibold mt-2">1200$</p>
+          <p className="text-xs text-text-muted mt-1">21,300 $</p>
+        </Card>
       </div>
     </div>
   );
-}
-
-function Card({
-  title,
-  value,
-  sub,
-}: {
-  title: string;
-  value: string;
-  sub?: string;
-}) {
-  return (
-    <div className="surface-card p-4">
-      <p className="text-sm text-text-secondary">{title}</p>
-      <p className="text-2xl font-semibold mt-2">{value}</p>
-      {sub && <p className="text-xs text-text-muted mt-1">{sub}</p>}
-    </div>
-  );
 }

frontend/src/components/ui/appointments/AppointmentScheduleGrid.tsx

@@ -3,7 +3,10 @@
 import { Trash2 } from 'lucide-react';
 import type { AppointmentColumnProvider, AppointmentRecord } from '@/types/appointment';
 import { formatHourLabel } from '@/lib/appointmentTime';
-import { purposeDeleteIconClass, purposeStyle } from '@/components/ui/appointments/appointmentPurposeStyles';
+import {
+  purposeDeleteIconClass,
+  purposeStyle,
+} from '@/components/ui/appointments/appointmentPurposeStyles';
 
 const HOUR_PX = 40;
 const HOURS = Array.from({ length: 24 }, (_, i) => i);
@@ -133,7 +136,7 @@ export function AppointmentScheduleGrid({
                         {canDelete && onDeleteAppointment && (
                           <button
                             type="button"
-                            className="group pointer-events-auto shrink-0 self-center z-20 mr-2 ml-1 inline-flex cursor-pointer items-center justify-center rounded-[var(--radius-sm)] border-0 bg-transparent p-1 outline-none focus-visible:ring-2 focus-visible:ring-primary/35"
+                            className="group pointer-events-auto shrink-0 self-center z-20 mr-0.5 ml-0.5 inline-flex cursor-pointer items-center justify-center rounded-[var(--radius-sm)] bg-transparent p-1 outline-none focus-visible:ring-2 focus-visible:ring-primary/35"
                             aria-label="Delete appointment"
                             title="Delete appointment"
                             onClick={(e) => {

frontend/src/components/ui/appointments/appointmentPurposeStyles.ts

@@ -10,11 +10,12 @@ export const APPOINTMENT_PURPOSE_LABEL: Record<AppointmentPurpose, string> = {
 
 /** Background + border for blocks / legend (matches reference palette). */
 export const APPOINTMENT_PURPOSE_STYLES: Record<AppointmentPurpose, string> = {
-  consultation: 'bg-violet-500/25 border-violet-400/50 text-violet-100',
+  consultation:
-  filling: 'bg-orange-500/25 border-orange-400/50 text-orange-100',
+    'bg-purpose-consultation-bg border-purpose-consultation-border text-purpose-consultation-fg',
-  endo: 'bg-red-500/25 border-red-400/50 text-red-100',
+  filling: 'bg-purpose-filling-bg border-purpose-filling-border text-purpose-filling-fg',
-  visit: 'bg-sky-500/25 border-sky-400/50 text-sky-100',
+  endo: 'bg-purpose-endo-bg border-purpose-endo-border text-purpose-endo-fg',
-  hygiene: 'bg-lime-500/20 border-lime-400/45 text-lime-100',
+  visit: 'bg-purpose-visit-bg border-purpose-visit-border text-purpose-visit-fg',
+  hygiene: 'bg-purpose-hygiene-bg border-purpose-hygiene-border text-purpose-hygiene-fg',
 };
 
 export function purposeStyle(purpose: string): string {
@@ -26,13 +27,13 @@ export function purposeStyle(purpose: string): string {
 export function purposeDeleteIconClass(purpose: string): string {
   const p = purpose as AppointmentPurpose;
   const map: Record<AppointmentPurpose, string> = {
-    consultation: '!text-violet-400 group-hover:!text-violet-300',
+    consultation: '!text-purpose-consultation-fg',
-    filling: '!text-orange-400 group-hover:!text-orange-300',
+    filling: '!text-purpose-filling-fg',
-    endo: '!text-red-400 group-hover:!text-red-300',
+    endo: '!text-purpose-endo-fg',
-    visit: '!text-sky-400 group-hover:!text-sky-300',
+    visit: '!text-purpose-visit-fg',
-    hygiene: '!text-lime-600 group-hover:!text-lime-500',
+    hygiene: '!text-purpose-hygiene-fg',
   };
-  return map[p] ?? '!text-text-muted group-hover:!text-text-secondary';
+  return map[p] ?? '!text-text-muted';
 }
 
 /** Small swatch for legend (background + border only). */

frontend/src/components/ui/common/Badge.tsx

@@ -14,10 +14,10 @@ interface BadgeProps {
 }
 
 const variantStyles: Record<BadgeVariant, string> = {
-  success: 'bg-emerald-900/30 text-emerald-300 border-emerald-700/60',
+  success: 'bg-badge-success-bg text-badge-success-fg border-badge-success-border',
-  warning: 'bg-amber-900/30 text-amber-300 border-amber-700/60',
+  warning: 'bg-badge-warning-bg text-badge-warning-fg border-badge-warning-border',
-  danger: 'bg-red-950/30 text-red-300 border-red-700/60',
+  danger: 'bg-badge-danger-bg text-badge-danger-fg border-badge-danger-border',
-  default: 'bg-background-secondary text-text-secondary border-border',
+  default: 'bg-badge-default-bg text-badge-default-fg border-badge-default-border',
 };
 
 /** Explicit width + height so every row matches; flex centers label optically. */

frontend/src/components/ui/common/Card.tsx

@@ -0,0 +1,36 @@
+import type { ElementType, ReactNode } from 'react';
+
+type CardPadding = 'none' | 'sm' | 'md' | 'lg';
+
+type CardProps<T extends ElementType = 'div'> = {
+  children: ReactNode;
+  padding?: CardPadding;
+  as?: T;
+  className?: string;
+} & Omit<React.ComponentPropsWithoutRef<T>, 'as' | 'children' | 'className'>;
+
+const paddingClassMap: Record<CardPadding, string> = {
+  none: '',
+  sm: 'p-3',
+  md: 'p-4',
+  lg: 'p-6',
+};
+
+export function Card<T extends ElementType = 'div'>({
+  children,
+  as,
+  className = '',
+  padding = 'md',
+  ...props
+}: CardProps<T>) {
+  const Component = as ?? 'div';
+
+  return (
+    <Component
+      className={`rounded-[var(--radius-lg)] border border-card-border bg-card text-card-foreground ${paddingClassMap[padding]} ${className}`}
+      {...props}
+    >
+      {children}
+    </Component>
+  );
+}

frontend/src/components/ui/treatment/AppointmentsStrip.tsx

@@ -2,6 +2,7 @@
 
 import { CalendarDays } from 'lucide-react';
 import { purposeStyle } from '@/components/ui/appointments/appointmentPurposeStyles';
+import { Card } from '@/components/ui/common/Card';
 import { ScheduleDayPicker } from '@/components/ui/common/ScheduleDayPicker';
 import { startOfLocalDay } from '@/lib/appointmentTime';
 import type { TreatmentAppointment } from '@/types/treatment';
@@ -32,7 +33,7 @@ export function AppointmentsStrip({
 }: AppointmentsStripProps) {
   if (stripHidden) {
     return (
-      <div className="surface-card p-3 flex items-center justify-between gap-3 flex-wrap">
+      <Card className="flex items-center justify-between gap-3 flex-wrap" padding="sm">
         <p className="text-sm text-text-secondary">Appointments are hidden.</p>
         <button
           type="button"
@@ -41,12 +42,12 @@ export function AppointmentsStrip({
         >
           Show appointments
         </button>
-      </div>
+      </Card>
     );
   }
 
   return (
-    <div className="surface-card p-4 space-y-4">
+    <Card className="space-y-4">
       <div className="flex items-center justify-between gap-3 flex-wrap">
         <div className="flex items-center gap-2 min-w-0">
           <CalendarDays className="w-5 h-5 text-text-muted shrink-0 icon-flat" aria-hidden />
@@ -89,12 +90,14 @@ export function AppointmentsStrip({
           })}`;
           const palette = purposeStyle(a.purpose);
           return (
-            <button
+            <Card
+              as="button"
               key={a.id}
               type="button"
               onClick={() => onSelectAppointment(a.id)}
+              padding="none"
               className={`
-                text-left rounded-[var(--radius-sm)] border px-3 py-2 min-w-[200px] max-w-[280px] transition-shadow min-h-[52px]
+                text-left rounded-[var(--radius-sm)] px-3 py-2 min-w-[200px] max-w-[280px] transition-shadow min-h-[52px]
                 focus:outline-none focus-visible:ring-2 focus-visible:ring-primary/45
                 ${palette}
                 ${sel ? 'ring-2 ring-primary ring-offset-2 ring-offset-background-secondary shadow-[inset_0_1px_0_rgba(255,255,255,0.06)]' : 'hover:brightness-110'}
@@ -105,10 +108,10 @@ export function AppointmentsStrip({
                 {a.patientFirstName} {a.patientLastName}
               </p>
               <p className="text-[11px] opacity-90 capitalize mt-0.5">{a.purpose}</p>
-            </button>
+            </Card>
           );
         })}
       </div>
-    </div>
+    </Card>
   );
 }

frontend/src/styles/globals.css

@@ -18,6 +18,40 @@
   --color-border: #d2dcec;
   --color-border-strong: #aec0de;
 
+  --color-card-background: #ffffff;
+  --color-card-foreground: #0f172a;
+  --color-card-muted: #475569;
+  --color-card-border: #d2dcec;
+
+  --color-badge-default-bg: #edf3fb;
+  --color-badge-default-fg: #1e293b;
+  --color-badge-default-border: #c9d8ec;
+  --color-badge-success-bg: #e6f7ef;
+  --color-badge-success-fg: #14532d;
+  --color-badge-success-border: #98d8b5;
+  --color-badge-warning-bg: #fff4df;
+  --color-badge-warning-fg: #92400e;
+  --color-badge-warning-border: #f6c88b;
+  --color-badge-danger-bg: #ffe8e8;
+  --color-badge-danger-fg: #991b1b;
+  --color-badge-danger-border: #f2b0b0;
+
+  --color-purpose-consultation-bg: #f1eafe;
+  --color-purpose-consultation-fg: #5b21b6;
+  --color-purpose-consultation-border: #cfb8f7;
+  --color-purpose-filling-bg: #fff1e5;
+  --color-purpose-filling-fg: #9a3412;
+  --color-purpose-filling-border: #f8c9a6;
+  --color-purpose-endo-bg: #ffe9e9;
+  --color-purpose-endo-fg: #991b1b;
+  --color-purpose-endo-border: #f4b6b6;
+  --color-purpose-visit-bg: #e7f4ff;
+  --color-purpose-visit-fg: #0c4a6e;
+  --color-purpose-visit-border: #abd8f3;
+  --color-purpose-hygiene-bg: #effadf;
+  --color-purpose-hygiene-fg: #3f6212;
+  --color-purpose-hygiene-border: #cbe9a1;
+
   --color-primary: #009cae;
   --color-primary-contrast: #031014;
   --color-primary-soft: rgba(0, 156, 174, 0.16);
@@ -42,6 +76,40 @@
   --color-border: #29456a;
   --color-border-strong: #3b5f8f;
 
+  --color-card-background: #14253d;
+  --color-card-foreground: #f5f9ff;
+  --color-card-muted: #b6c6dd;
+  --color-card-border: #29456a;
+
+  --color-badge-default-bg: #1b2f4e;
+  --color-badge-default-fg: #b6c6dd;
+  --color-badge-default-border: #3b5f8f;
+  --color-badge-success-bg: rgba(6, 78, 59, 0.45);
+  --color-badge-success-fg: #86efac;
+  --color-badge-success-border: rgba(21, 128, 61, 0.5);
+  --color-badge-warning-bg: rgba(120, 53, 15, 0.48);
+  --color-badge-warning-fg: #fcd34d;
+  --color-badge-warning-border: rgba(180, 83, 9, 0.55);
+  --color-badge-danger-bg: rgba(127, 29, 29, 0.42);
+  --color-badge-danger-fg: #fca5a5;
+  --color-badge-danger-border: rgba(185, 28, 28, 0.52);
+
+  --color-purpose-consultation-bg: rgba(139, 92, 246, 0.25);
+  --color-purpose-consultation-fg: #ddd6fe;
+  --color-purpose-consultation-border: rgba(167, 139, 250, 0.5);
+  --color-purpose-filling-bg: rgba(249, 115, 22, 0.25);
+  --color-purpose-filling-fg: #fed7aa;
+  --color-purpose-filling-border: rgba(251, 146, 60, 0.5);
+  --color-purpose-endo-bg: rgba(239, 68, 68, 0.25);
+  --color-purpose-endo-fg: #fecaca;
+  --color-purpose-endo-border: rgba(248, 113, 113, 0.5);
+  --color-purpose-visit-bg: rgba(14, 165, 233, 0.25);
+  --color-purpose-visit-fg: #bae6fd;
+  --color-purpose-visit-border: rgba(56, 189, 248, 0.5);
+  --color-purpose-hygiene-bg: rgba(132, 204, 22, 0.2);
+  --color-purpose-hygiene-fg: #d9f99d;
+  --color-purpose-hygiene-border: rgba(163, 230, 53, 0.45);
+
   --color-primary: #09a9bc;
   --color-primary-contrast: #001117;
   --color-primary-soft: rgba(9, 169, 188, 0.2);
@@ -66,6 +134,40 @@
   --color-border: #29456a;
   --color-border-strong: #3b5f8f;
 
+  --color-card-background: #14253d;
+  --color-card-foreground: #f5f9ff;
+  --color-card-muted: #b6c6dd;
+  --color-card-border: #29456a;
+
+  --color-badge-default-bg: #1b2f4e;
+  --color-badge-default-fg: #b6c6dd;
+  --color-badge-default-border: #3b5f8f;
+  --color-badge-success-bg: rgba(6, 78, 59, 0.45);
+  --color-badge-success-fg: #86efac;
+  --color-badge-success-border: rgba(21, 128, 61, 0.5);
+  --color-badge-warning-bg: rgba(120, 53, 15, 0.48);
+  --color-badge-warning-fg: #fcd34d;
+  --color-badge-warning-border: rgba(180, 83, 9, 0.55);
+  --color-badge-danger-bg: rgba(127, 29, 29, 0.42);
+  --color-badge-danger-fg: #fca5a5;
+  --color-badge-danger-border: rgba(185, 28, 28, 0.52);
+
+  --color-purpose-consultation-bg: rgba(139, 92, 246, 0.25);
+  --color-purpose-consultation-fg: #ddd6fe;
+  --color-purpose-consultation-border: rgba(167, 139, 250, 0.5);
+  --color-purpose-filling-bg: rgba(249, 115, 22, 0.25);
+  --color-purpose-filling-fg: #fed7aa;
+  --color-purpose-filling-border: rgba(251, 146, 60, 0.5);
+  --color-purpose-endo-bg: rgba(239, 68, 68, 0.25);
+  --color-purpose-endo-fg: #fecaca;
+  --color-purpose-endo-border: rgba(248, 113, 113, 0.5);
+  --color-purpose-visit-bg: rgba(14, 165, 233, 0.25);
+  --color-purpose-visit-fg: #bae6fd;
+  --color-purpose-visit-border: rgba(56, 189, 248, 0.5);
+  --color-purpose-hygiene-bg: rgba(132, 204, 22, 0.2);
+  --color-purpose-hygiene-fg: #d9f99d;
+  --color-purpose-hygiene-border: rgba(163, 230, 53, 0.45);
+
   --color-primary: #09a9bc;
   --color-primary-contrast: #001117;
   --color-primary-soft: rgba(9, 169, 188, 0.2);
@@ -89,6 +191,37 @@
 
   --color-border: var(--color-border);
   --color-border-strong: var(--color-border-strong);
+  --color-card: var(--color-card-background);
+  --color-card-foreground: var(--color-card-foreground);
+  --color-card-muted: var(--color-card-muted);
+  --color-card-border: var(--color-card-border);
+  --color-badge-default-bg: var(--color-badge-default-bg);
+  --color-badge-default-fg: var(--color-badge-default-fg);
+  --color-badge-default-border: var(--color-badge-default-border);
+  --color-badge-success-bg: var(--color-badge-success-bg);
+  --color-badge-success-fg: var(--color-badge-success-fg);
+  --color-badge-success-border: var(--color-badge-success-border);
+  --color-badge-warning-bg: var(--color-badge-warning-bg);
+  --color-badge-warning-fg: var(--color-badge-warning-fg);
+  --color-badge-warning-border: var(--color-badge-warning-border);
+  --color-badge-danger-bg: var(--color-badge-danger-bg);
+  --color-badge-danger-fg: var(--color-badge-danger-fg);
+  --color-badge-danger-border: var(--color-badge-danger-border);
+  --color-purpose-consultation-bg: var(--color-purpose-consultation-bg);
+  --color-purpose-consultation-fg: var(--color-purpose-consultation-fg);
+  --color-purpose-consultation-border: var(--color-purpose-consultation-border);
+  --color-purpose-filling-bg: var(--color-purpose-filling-bg);
+  --color-purpose-filling-fg: var(--color-purpose-filling-fg);
+  --color-purpose-filling-border: var(--color-purpose-filling-border);
+  --color-purpose-endo-bg: var(--color-purpose-endo-bg);
+  --color-purpose-endo-fg: var(--color-purpose-endo-fg);
+  --color-purpose-endo-border: var(--color-purpose-endo-border);
+  --color-purpose-visit-bg: var(--color-purpose-visit-bg);
+  --color-purpose-visit-fg: var(--color-purpose-visit-fg);
+  --color-purpose-visit-border: var(--color-purpose-visit-border);
+  --color-purpose-hygiene-bg: var(--color-purpose-hygiene-bg);
+  --color-purpose-hygiene-fg: var(--color-purpose-hygiene-fg);
+  --color-purpose-hygiene-border: var(--color-purpose-hygiene-border);
   --color-primary: var(--color-primary);
   --color-primary-contrast: var(--color-primary-contrast);
   --color-primary-soft: var(--color-primary-soft);
@@ -115,8 +248,9 @@ body {
 }
 
 .surface-card {
-  background: color-mix(in srgb, var(--color-background-card) 92%, transparent);
+  background: color-mix(in srgb, var(--color-card-background) 92%, transparent);
-  border: 1px solid var(--color-border);
+  border: 1px solid var(--color-card-border);
+  color: var(--color-card-foreground);
   border-radius: var(--radius-lg);
 }