diff --git a/themes/dark_spinel.json b/themes/dark_spinel.json
index c845654..364a969 100644
--- a/themes/dark_spinel.json
+++ b/themes/dark_spinel.json
@@ -85,6 +85,17 @@
     "enum": {
       "foreground": "#4b82e9",
       "fontStyle": ""
+    },
+    "struct": {
+      "foreground": "#4b82e9"
+    },
+    "selfTypeKeyword": {
+      "foreground": "#ed2a88",
+      "fontStyle": "bold"
+    },
+    "selfKeyword": {
+      "foreground": "#ed2a88",
+      "fontStyle": "bold"
     }
   },
   "tokenColors": [
@@ -128,7 +139,11 @@
         "string.unquoted.plain.out.yaml",
         "source.sql",
         "constant.other.table-name.sql",
-        "meta.function.call.rust"
+        "meta.function.call.rust",
+        "keyword.operator.key-value.rust",
+        "keyword.operator.assignment.c",
+        "keyword.operator.comparison.c",
+        "keyword.operator.increment.c"
       ],
       "settings": {
         "foreground": "#d1ccf1"
@@ -166,6 +181,7 @@
         "variable.language",
         "storage.type.variable",
         "storage.modifier",
+        "storage.type.built-in.primitive.c",
         "storage.type.built-in.primitive.cpp",
         "storage.type.primitive.cpp",
         "punctuation.separator.pointer-access.cpp",
diff --git a/themes/light_spinel.json b/themes/light_spinel.json
index ec492a5..7755530 100644
--- a/themes/light_spinel.json
+++ b/themes/light_spinel.json
@@ -110,6 +110,17 @@
     "enum": {
       "foreground": "#1e45e0",
       "fontStyle": ""
+    },
+    "struct": {
+      "foreground": "#4b82e9"
+    },
+    "selfTypeKeyword": {
+      "foreground": "#ed2a88",
+      "fontStyle": "bold"
+    },
+    "selfKeyword": {
+      "foreground": "#ed2a88",
+      "fontStyle": "bold"
     }
   },
   "tokenColors": [
@@ -152,7 +163,11 @@
         "string.unquoted.plain.out.yaml",
         "source.sql",
         "constant.other.table-name.sql",
-        "meta.function.call.rust"
+        "meta.function.call.rust",
+        "keyword.operator.key-value.rust",
+        "keyword.operator.assignment.c",
+        "keyword.operator.comparison.c",
+        "keyword.operator.increment.c"
       ],
       "settings": {
         "foreground": "#595959"
@@ -190,6 +205,7 @@
         "variable.language",
         "storage.type.variable",
         "storage.modifier",
+        "storage.type.built-in.primitive.c",
         "storage.type.built-in.primitive.cpp",
         "storage.type.primitive.cpp",
         "punctuation.separator.pointer-access.cpp",