diff --git a/src/routes/[recipeLang=recipeLang]/+page.svelte b/src/routes/[recipeLang=recipeLang]/+page.svelte
index 1eb60b58..83b47dd7 100644
--- a/src/routes/[recipeLang=recipeLang]/+page.svelte
+++ b/src/routes/[recipeLang=recipeLang]/+page.svelte
@@ -273,7 +273,7 @@
 }
 .chip.active {
 	background: var(--color-primary);
-	color: white;
+	color: var(--color-text-on-primary);
 }
 .chip.season {
 	background: var(--color-accent);
diff --git a/src/routes/fitness/[history=fitnessHistory]/[id]/+page.svelte b/src/routes/fitness/[history=fitnessHistory]/[id]/+page.svelte
index 0a21f057..2e851a5f 100644
--- a/src/routes/fitness/[history=fitnessHistory]/[id]/+page.svelte
+++ b/src/routes/fitness/[history=fitnessHistory]/[id]/+page.svelte
@@ -843,7 +843,7 @@
 	}
 	.save-btn {
 		background: var(--color-primary);
-		color: white;
+		color: var(--color-text-on-primary);
 		border: none;
 		border-radius: 8px;
 		padding: 0.4rem 1rem;
@@ -1057,7 +1057,7 @@
 		width: 100%;
 		padding: 0.75rem;
 		background: var(--color-primary);
-		color: white;
+		color: var(--color-text-on-primary);
 		border: none;
 		border-radius: 10px;
 		font-weight: 700;
diff --git a/src/routes/fitness/[nutrition=fitnessNutrition]/+page.svelte b/src/routes/fitness/[nutrition=fitnessNutrition]/+page.svelte
index c449c507..82f4cc6e 100644
--- a/src/routes/fitness/[nutrition=fitnessNutrition]/+page.svelte
+++ b/src/routes/fitness/[nutrition=fitnessNutrition]/+page.svelte
@@ -3725,7 +3725,7 @@
 		border: none;
 		border-radius: 6px;
 		background: var(--color-primary);
-		color: white;
+		color: var(--color-text-on-primary);
 		cursor: pointer;
 		transition: filter 0.12s;
 	}
diff --git a/src/routes/fitness/[nutrition=fitnessNutrition]/meals/+page.svelte b/src/routes/fitness/[nutrition=fitnessNutrition]/meals/+page.svelte
index 9340bd5c..30e2030c 100644
--- a/src/routes/fitness/[nutrition=fitnessNutrition]/meals/+page.svelte
+++ b/src/routes/fitness/[nutrition=fitnessNutrition]/meals/+page.svelte
@@ -358,8 +358,8 @@
 		display: flex;
 		align-items: center;
 		gap: 0.35rem;
-		background: var(--nord8);
-		color: #fff;
+		background: var(--color-primary);
+		color: var(--color-text-on-primary);
 		border: none;
 		border-radius: 8px;
 		padding: 0.5rem 0.85rem;
@@ -369,7 +369,7 @@
 		transition: background 0.15s;
 	}
 	.create-btn:hover {
-		background: var(--nord10);
+		background: var(--color-primary-hover);
 	}
 
 	/* ── Loading ── */
@@ -700,11 +700,11 @@
 		cursor: default;
 	}
 	.btn.primary {
-		background: var(--nord8);
-		color: #fff;
+		background: var(--color-primary);
+		color: var(--color-text-on-primary);
 	}
 	.btn.primary:hover:not(:disabled) {
-		background: var(--nord10);
+		background: var(--color-primary-hover);
 	}
 	.btn.secondary {
 		background: var(--color-bg-tertiary);