diff --git a/themes/ShinyCode-color-theme.json b/themes/ShinyCode-color-theme.json
index d82daf4..7f147bd 100644
--- a/themes/ShinyCode-color-theme.json
+++ b/themes/ShinyCode-color-theme.json
@@ -1,54 +1,49 @@
 {
 	"name": "ShinyCode",
 	"colors": {
-		"foreground": "#E1E2E9",
-		"focusBorder": "#8B9198",
-		"disabledForeground": "#E1E2E960",
+		"foreground": "#E1E2E8", // onSurface
+		"focusBorder": "#41474D", // outlineVariant
+		"disabledForeground": "#E1E2E960",  // onBackground (semitransparent)
 
-		"editor.background": "#111318",
+		"editor.background": "#101418", // surface
 
-		"widget.shadow": "#000000",
-		"editorWidget.background": "#1D2024",
-		"editorWidget.resizeBorder": "#41474D",
-		"breadcrumb.background": "#1D2024",
-		"tab.activeBackground": "#272A2F",
-		"tab.activeBorder": "#E1E2E9",
-		"tab.border": "#101418",
+		"widget.shadow": "#000000", // shadow
+		"editorWidget.background": "#1D2024", // surfaceContainer
+		"editorWidget.resizeBorder": "#41474D", // surfaceVariant
+		"breadcrumb.background": "#1D2024", // surfaceContainer
+		"tab.activeBackground": "#272A2F", // surfaceContainerHigh
+		"tab.activeBorder": "#E1E2E8", // onSurface
+		"tab.border": "#101418", // surface
 		"tab.inactiveBackground": "#272A2F",
 		"editorGroupHeader.tabsBackground": "#272A2F",
 		
-		"sideBar.background": "#0B0E13",
-		"sideBar.border": "#101418",
-		"sideBarSectionHeader.background": "#191C20",
-		"sideBarTitle.background": "#272A2F",
-		"activityBar.background": "#272A2F",
-		"activityBarTop.background": "#272A2F",
+		"sideBar.background": "#0B0E13", // surfaceContainerLowest
+		"sideBar.border": "#101418", // surface
+		"sideBarSectionHeader.background": "#191C20", // surfaceContainerLow
+		"sideBarTitle.background": "#272A2F", // surfaceContainerHigh
+		"activityBar.background": "#272A2F", // surfaceContainerHigh
+		"activityBarTop.background": "#272A2F", // surfaceContainerHigh
 
-		"panel.background": "#0B0E13",
-		"panel.border": "#101418",
-		"panelSectionHeader.background": "#1D2024",
+		"panel.background": "#0B0E13", // surfaceContainerLowest
+		"panel.border": "#101418", // surface
+		"panelSectionHeader.background": "#1D2024", // surfaceContainer
 
-		"statusBar.background": "#272A2F",
-		"statusBar.border": "#101418",
+		"statusBar.background": "#272A2F", // surfaceContainerHigh
+		"statusBar.border": "#101418", // surface
 
-		"titleBar.activeBackground": "#32353A",
-		"menu.background": "#32353A",
-		"menu.separatorBackground": "#41474D",
-		"menu.selectionBackground": "#41474D",
+		"titleBar.activeBackground": "#32353A", // surfaceContainerHighest
+		"menu.background": "#32353A", // surfaceContainerHighest
+		"menu.separatorBackground": "#41474D", // surfaceVariant
+		"menu.selectionBackground": "#41474D", // surfaceVariant
 
-		"button.background": "#A7C8FF",
-		"button.foreground": "#04305F",
-		"input.background": "#244777",
-		"input.foreground": "#D5E3FF",
-		"dropdown.background": "#244777",
-		"dropdown.foreground": "#D5E3FF",
-		"badge.background": "#3C4279",
-		"badge.foreground": "#DFE0FF",
-
-		"textLink.foreground": "#5BD5FF",
-		"textLink.activeForeground": "#89D0ED",
-
-		"settings.modifiedItemIndicator": "#3E5F90",
+		"button.background": "#A7C8FF", // primary
+		"button.foreground": "#04305F", // onPrimary
+		"input.background": "#244777", // primaryContainer
+		"input.foreground": "#D5E3FF", // onPrimaryContainer
+		"dropdown.background": "#244777", // primaryContainer
+		"dropdown.foreground": "#D5E3FF", // onPrimaryContainer
+		"badge.background": "#3C4279", // tertiaryContainer
+		"badge.foreground": "#DFE0FF", // onTertiaryContainer
 	},
 	"tokenColors": [
 		{