diff --git a/themes/ShinyCode-color-theme.json b/themes/ShinyCode-color-theme.json
index a2be166..4a05bff 100644
--- a/themes/ShinyCode-color-theme.json
+++ b/themes/ShinyCode-color-theme.json
@@ -59,11 +59,21 @@
 			"name": "Comments",
 			"scope": [
 				"comment",
+				"comment punctuation", // Override comment begin punctuation
 			],
 			"settings": {
 				"foreground": "#3C4279",
 			}
 		},
+		{
+			"name": "Magic",
+			"scope": [
+				"variable.language",
+			],
+			"settings": {
+				"foreground": "#FFDBCA", // axiom 90
+			}
+		},
 		{
 			"name": "Keywords",
 			"scope": [
@@ -85,12 +95,31 @@
 			}
 		},
 		{
-			"name": "Functions",
+			"name": "Function parameters",
 			"scope": [
-				"entity.name.function",
+				"meta.function.definition variable"
 			],
 			"settings": {
-				"foreground": "#D4C972",
+				"foreground": "#F2E57F", // action 90
+			}
+		},
+		{
+			"name": "Function definitions",
+			"scope": [
+				"meta.function.definition entity.name.function"
+			],
+			"settings": {
+				"foreground": "#B9AC37", // action 70
+				"fontStyle": "bold",
+			}
+		},
+		{
+			"name": "Function calls",
+			"scope": [
+				"meta.function.call entity.name.function",
+			],
+			"settings": {
+				"foreground": "#6E7D16", // action 50
 			}
 		},
 		{
@@ -145,14 +174,39 @@
 	],
 	"semanticHighlighting": true,
 	"semanticTokenColors": {
-		"comment": "#3C4279",
-		"keyword": "#F79159",
-		"function": "#D4C972",
-		"interface": "#A2D399",
-		"type": "#87D6BC",
-		"variable": "#89D0ED",
-		"string": "#D1BCFD",
-		"constant": "#D1BCFD",
-		"enum": "#EEB4EA",
+		"comment": {
+			"foreground":"#3C4279",
+		},
+		"selfParameter": {
+			"foreground": "#FFDBCA",
+		},
+		"keyword": {
+			"foreground": "#F58F59",
+		},
+		"function": {
+			"foreground": "#6E7D16",
+		},
+		"function.declaration":{
+			"foreground": "#B9AC37",
+			"fontStyle": "bold"
+		},
+		"interface": {
+			"foreground":"#65BE60",
+		},
+		"type": {
+			"foreground":"#87D6BC",
+		},
+		"variable": {
+			"foreground":"#89D0ED",
+		},
+		"string": {
+			"foreground":"#D1BCFD",
+		},
+		"constant": {
+			"foreground":"#D1BCFD",
+		},
+		"enum": {
+			"foreground":"#EEB4EA",
+		},
 	}
 }