diff --git a/src/client/theme/light.json5 b/src/client/theme/light.json5
index 1e795ee8c5..90d0d40187 100644
--- a/src/client/theme/light.json5
+++ b/src/client/theme/light.json5
@@ -23,13 +23,13 @@
 		scrollbarHandleHover: '#00000066',
 
 		face: '$secondary',
-		faceText: '#444',
+		faceText: '$text',
 		faceHeader: ':lighten<5<$secondary',
-		faceHeaderText: '#888',
+		faceHeaderText: '$text',
 		faceDivider: 'rgba(0, 0, 0, 0.082)',
-		faceTextButton: '#ccc',
-		faceTextButtonHover: '#aaa',
-		faceTextButtonActive: '#999',
+		faceTextButton: ':alpha<0.7<$text',
+		faceTextButtonHover: ':alpha<0.7<:darken<7<$text',
+		faceTextButtonActive: ':alpha<0.7<:darken<10<$text',
 		faceClearButtonHover: 'rgba(0, 0, 0, 0.025)',
 		faceClearButtonActive: 'rgba(0, 0, 0, 0.05)',
 		popupBg: ':lighten<5<$secondary',
@@ -40,7 +40,7 @@
 		renoteGradient: '#edfde2',
 		renoteText: '#9dbb00',
 		quoteBorder: '#c0dac6',
-		noteText: '#717171',
+		noteText: '$text',
 		noteHeaderName: ':darken<2<$text',
 		noteHeaderBadgeFg: '#aaa',
 		noteHeaderBadgeBg: 'rgba(0, 0, 0, 0.05)',
@@ -141,7 +141,7 @@
 
 		desktopHeaderBg: ':lighten<5<$secondary',
 		desktopHeaderFg: '$text',
-		desktopHeaderHoverFg: '#7b8c88',
+		desktopHeaderHoverFg: ':darken<7<$text',
 		desktopHeaderSearchBg: 'rgba(0, 0, 0, 0.05)',
 		desktopHeaderSearchHoverBg: 'rgba(0, 0, 0, 0.08)',
 		desktopHeaderSearchFg: '#000',
@@ -156,9 +156,9 @@
 		desktopPostFormTransparentButtonActiveGradientEnd: ':lighten<33<$primary',
 		desktopRenoteFormFooter: ':lighten<33<$primary',
 		desktopTimelineHeaderShadow: 'rgba(0, 0, 0, 0.08)',
-		desktopTimelineSrc: '#6f7477',
-		desktopTimelineSrcHover: '#525a5f',
-		desktopWindowTitle: '#666',
+		desktopTimelineSrc: '$text',
+		desktopTimelineSrcHover: ':darken<7<$text',
+		desktopWindowTitle: '$text',
 		desktopWindowShadow: 'rgba(0, 0, 0, 0.2)',
 		desktopDriveBg: '#fff',
 		desktopDriveFolderBg: ':lighten<31<$primary',