diff --git a/crates/story/examples/code-editor.rs b/crates/story/examples/code-editor.rs
index 1c3d6edb..603f4a1d 100644
--- a/crates/story/examples/code-editor.rs
+++ b/crates/story/examples/code-editor.rs
@@ -131,9 +131,9 @@ impl Render for Example {
                     .id("source")
                     .w_full()
                     .flex_1()
-                    .font_family("Menlo")
+                    .font_family("Monaco")
                     .p_4()
-                    .text_size(px(13.))
+                    .text_size(px(12.))
                     .child(TextInput::new(&self.input_state).h_full()),
             )
     }
diff --git a/crates/ui/src/highlighter/themes/dark.tmTheme b/crates/ui/src/highlighter/themes/dark.tmTheme
index 8c47c716..6aabc3b4 100644
--- a/crates/ui/src/highlighter/themes/dark.tmTheme
+++ b/crates/ui/src/highlighter/themes/dark.tmTheme
@@ -110,7 +110,7 @@
         <key>name</key>
         <string>Function Name</string>
         <key>scope</key>
-        <string>entity.name.function, support.function, support.function.any-method</string>
+        <string>entity.name.function, support.function, support.function.any-method, variable.annotation</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -121,9 +121,9 @@
       <!-- Keyword -->
       <dict>
         <key>name</key>
-        <string>Keyword</string>
+        <string>Keyword, self</string>
         <key>scope</key>
-        <string>keyword, storage</string>
+        <string>keyword, storage, variable.language</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -136,7 +136,7 @@
         <key>name</key>
         <string>Class</string>
         <key>scope</key>
-        <string>support.class, support.type, entity.name.class, entity.name.type.class, meta.class</string>
+        <string>entity, support.class, support.type, entity.name.class, entity.name.trait, meta.class</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -296,7 +296,7 @@
         <key>name</key>
         <string>Variable</string>
         <key>scope</key>
-        <string>variable.language, variable.other</string>
+        <string>variable.other</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
diff --git a/crates/ui/src/highlighter/themes/light.tmTheme b/crates/ui/src/highlighter/themes/light.tmTheme
index a75a8794..1676a769 100644
--- a/crates/ui/src/highlighter/themes/light.tmTheme
+++ b/crates/ui/src/highlighter/themes/light.tmTheme
@@ -71,9 +71,9 @@
       <!-- Constant -->
       <dict>
         <key>name</key>
-        <string>Constant</string>
+        <string>Constant, self</string>
         <key>scope</key>
-        <string>constant, constant.other</string>
+        <string>constant, constant.other, variable.language</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -107,6 +107,19 @@
         </dict>
       </dict>
 
+
+      <dict>
+        <key>name</key>
+        <string>Annotation</string>
+        <key>scope</key>
+        <string>variable.annotation</string>
+        <key>settings</key>
+        <dict>
+          <key>foreground</key>
+          <string>#9D8550</string>                      <!-- syntax.embedded.color -->
+        </dict>
+      </dict>
+
       <!-- Function -->
       <dict>
         <key>name</key>
@@ -137,7 +150,7 @@
         <key>name</key>
         <string>Class</string>
         <key>scope</key>
-        <string>support.class, support.type, entity.name.class, entity.name.type.class, meta.class</string>
+        <string>entity, support.class, support.type, entity.name.class, entity.name.type.class, meta.class, entity.name.constant, entity.name.namespace</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -191,7 +204,7 @@
         <key>name</key>
         <string>String</string>
         <key>scope</key>
-        <string>string, string.quoted</string>
+        <string>string, string.quoted, string.quoted.single, string.quoted.double, string.quoted.triple</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>
@@ -297,7 +310,7 @@
         <key>name</key>
         <string>Variable</string>
         <key>scope</key>
-        <string>variable.language, variable.other</string>
+        <string>variable.other</string>
         <key>settings</key>
         <dict>
           <key>foreground</key>