diff --git a/src/routes/(app)/database/artifact-skills/+page.svelte b/src/routes/(app)/database/artifact-skills/+page.svelte
index ed22ba35..081e9c08 100644
--- a/src/routes/(app)/database/artifact-skills/+page.svelte
+++ b/src/routes/(app)/database/artifact-skills/+page.svelte
@@ -188,7 +188,7 @@
 	.error {
 		text-align: center;
 		padding: spacing.$unit * 4;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 	}
 
 	.error {
@@ -243,7 +243,7 @@
 		border-bottom: 1px solid #dee2e6;
 		font-size: typography.$font-small;
 		font-weight: typography.$medium;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 	}
 
 	.col-modifier {
@@ -292,11 +292,11 @@
 
 		.name-jp {
 			font-size: typography.$font-small;
-			color: colors.$grey-50;
+			color: var(--text-secondary);
 		}
 
 		.not-set {
-			color: colors.$grey-60;
+			color: var(--text-tertiary);
 			font-style: italic;
 		}
 	}
@@ -337,7 +337,7 @@
 	.footer {
 		padding: spacing.$unit;
 		text-align: center;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 		font-size: typography.$font-small;
 		background: #f8f9fa;
 		border-top: 1px solid #e5e5e5;
diff --git a/src/routes/(app)/database/artifact-skills/[id]/+page.svelte b/src/routes/(app)/database/artifact-skills/[id]/+page.svelte
index 2a60416a..cbb03e83 100644
--- a/src/routes/(app)/database/artifact-skills/[id]/+page.svelte
+++ b/src/routes/(app)/database/artifact-skills/[id]/+page.svelte
@@ -287,7 +287,7 @@
 	.error {
 		text-align: center;
 		padding: spacing.$unit * 4;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 	}
 
 	.error {
@@ -356,7 +356,7 @@
 
 			.skill-group {
 				font-size: typography.$font-small;
-				color: colors.$grey-50;
+				color: var(--text-secondary);
 			}
 		}
 	}
diff --git a/src/routes/(app)/database/characters/[granblueId]/+page.svelte b/src/routes/(app)/database/characters/[granblueId]/+page.svelte
index a03396a2..bf0b5f0e 100644
--- a/src/routes/(app)/database/characters/[granblueId]/+page.svelte
+++ b/src/routes/(app)/database/characters/[granblueId]/+page.svelte
@@ -454,6 +454,6 @@
 	}
 
 	.empty-value {
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 	}
 </style>
diff --git a/src/routes/(app)/database/characters/import/+page.svelte b/src/routes/(app)/database/characters/import/+page.svelte
index 59d4f691..09519c80 100644
--- a/src/routes/(app)/database/characters/import/+page.svelte
+++ b/src/routes/(app)/database/characters/import/+page.svelte
@@ -690,7 +690,7 @@
 		background: transparent;
 		border: none;
 		border-radius: layout.$input-corner;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 		cursor: pointer;
 		flex-shrink: 0;
 
@@ -706,7 +706,7 @@
 
 	.hint {
 		font-size: typography.$font-small;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 		margin: 0;
 	}
 
@@ -743,7 +743,7 @@
 	.entity-loading {
 		padding: spacing.$unit-4x;
 		text-align: center;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 
 		h3 {
 			margin: 0 0 spacing.$unit 0;
diff --git a/src/routes/(app)/database/jobs/+page.svelte b/src/routes/(app)/database/jobs/+page.svelte
index 51385ac9..a1e5bcf3 100644
--- a/src/routes/(app)/database/jobs/+page.svelte
+++ b/src/routes/(app)/database/jobs/+page.svelte
@@ -192,7 +192,7 @@
 	.error {
 		text-align: center;
 		padding: spacing.$unit * 4;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 	}
 
 	.error {
@@ -312,7 +312,7 @@
 	.footer {
 		padding: spacing.$unit;
 		text-align: center;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 		font-size: typography.$font-small;
 		background: #f8f9fa;
 		border-top: 1px solid #e5e5e5;
diff --git a/src/routes/(app)/database/series/+page.svelte b/src/routes/(app)/database/series/+page.svelte
index 2dd906a7..e233afa9 100644
--- a/src/routes/(app)/database/series/+page.svelte
+++ b/src/routes/(app)/database/series/+page.svelte
@@ -128,7 +128,7 @@
 	.empty {
 		padding: spacing.$unit-4x;
 		text-align: center;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 	}
 
 	.error {
diff --git a/src/routes/(app)/database/summons/+page.svelte b/src/routes/(app)/database/summons/+page.svelte
index d4225c1c..96f38668 100644
--- a/src/routes/(app)/database/summons/+page.svelte
+++ b/src/routes/(app)/database/summons/+page.svelte
@@ -88,7 +88,7 @@
 
 		.subtitle {
 			font-size: typography.$font-regular;
-			color: colors.$grey-50;
+			color: var(--text-secondary);
 		}
 	}
 </style>
diff --git a/src/routes/(app)/database/summons/[granblueId]/+page.svelte b/src/routes/(app)/database/summons/[granblueId]/+page.svelte
index 75b81312..048418e6 100644
--- a/src/routes/(app)/database/summons/[granblueId]/+page.svelte
+++ b/src/routes/(app)/database/summons/[granblueId]/+page.svelte
@@ -461,6 +461,6 @@
 	}
 
 	.empty-value {
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 	}
 </style>
diff --git a/src/routes/(app)/database/summons/import/+page.svelte b/src/routes/(app)/database/summons/import/+page.svelte
index bf4e988e..78a9afbc 100644
--- a/src/routes/(app)/database/summons/import/+page.svelte
+++ b/src/routes/(app)/database/summons/import/+page.svelte
@@ -666,7 +666,7 @@
 		background: transparent;
 		border: none;
 		border-radius: layout.$input-corner;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 		cursor: pointer;
 		flex-shrink: 0;
 
@@ -682,7 +682,7 @@
 
 	.hint {
 		font-size: typography.$font-small;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 		margin: 0;
 	}
 
@@ -719,7 +719,7 @@
 	.entity-loading {
 		padding: spacing.$unit-4x;
 		text-align: center;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 
 		h3 {
 			margin: 0 0 spacing.$unit 0;
diff --git a/src/routes/(app)/database/weapons/+page.svelte b/src/routes/(app)/database/weapons/+page.svelte
index 72f2f12a..2e6b05a2 100644
--- a/src/routes/(app)/database/weapons/+page.svelte
+++ b/src/routes/(app)/database/weapons/+page.svelte
@@ -198,7 +198,7 @@
 	.empty-state {
 		padding: spacing.$unit-4x;
 		text-align: center;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 	}
 
 	.error-state {
diff --git a/src/routes/(app)/database/weapons/[granblueId]/+page.svelte b/src/routes/(app)/database/weapons/[granblueId]/+page.svelte
index 87d20f6f..cf515899 100644
--- a/src/routes/(app)/database/weapons/[granblueId]/+page.svelte
+++ b/src/routes/(app)/database/weapons/[granblueId]/+page.svelte
@@ -466,6 +466,6 @@
 	}
 
 	.empty-value {
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 	}
 </style>
diff --git a/src/routes/(app)/database/weapons/import/+page.svelte b/src/routes/(app)/database/weapons/import/+page.svelte
index 374e9320..ffbc1524 100644
--- a/src/routes/(app)/database/weapons/import/+page.svelte
+++ b/src/routes/(app)/database/weapons/import/+page.svelte
@@ -673,7 +673,7 @@
 		background: transparent;
 		border: none;
 		border-radius: layout.$input-corner;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 		cursor: pointer;
 		flex-shrink: 0;
 
@@ -689,7 +689,7 @@
 
 	.hint {
 		font-size: typography.$font-small;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 		margin: 0;
 	}
 
@@ -726,7 +726,7 @@
 	.entity-loading {
 		padding: spacing.$unit-4x;
 		text-align: center;
-		color: colors.$grey-50;
+		color: var(--text-secondary);
 
 		h3 {
 			margin: 0 0 spacing.$unit 0;