diff --git a/languages.toml b/languages.toml
index db997ac70..ebb44925d 100644
--- a/languages.toml
+++ b/languages.toml
@@ -761,7 +761,7 @@ indent = { tab-width = 4, unit = "\t" }
 
 [[grammar]]
 name = "gomod"
-source = { git = "https://github.com/camdencheek/tree-sitter-go-mod", rev = "e8f51f8e4363a3d9a427e8f63f4c1bbc5ef5d8d0" }
+source = { git = "https://github.com/camdencheek/tree-sitter-go-mod", rev = "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c" }
 
 [[language]]
 name = "gotmpl"
@@ -887,7 +887,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev =
 name = "css"
 scope = "source.css"
 injection-regex = "css"
-file-types = ["css", "scss"]
+file-types = ["css"]
 block-comment-tokens = { start = "/*", end = "*/" }
 language-servers = [ "vscode-css-language-server" ]
 auto-format = true
diff --git a/runtime/queries/scss/highlights.scm b/runtime/queries/scss/highlights.scm
index eb361f96a..e3818fb6f 100644
--- a/runtime/queries/scss/highlights.scm
+++ b/runtime/queries/scss/highlights.scm
@@ -1,47 +1,64 @@
 [(comment) (single_line_comment)] @comment
 
-"~" @operator
-">" @operator
-"+" @operator
-"-" @operator
-"*" @operator
-"/" @operator
-"=" @operator
-"^=" @operator
-"|=" @operator
-"~=" @operator
-"$=" @operator
-"*=" @operator
+[
+ "~"
+ ">"
+ "+"
+ "-"
+ "*"
+ "/"
+ "="
+ "^="
+ "|="
+ "~="
+ "$="
+ "*="
+] @operator
 
-"in" @operator
-"and" @operator
-"or" @operator
-"not" @operator
-"only" @operator
+[
+  "in"
+  "and"
+  "or"
+  "not"
+  "only"
+] @operator.control
+
+[
+  "@apply"
+  "@at-root"
+  "@charset"
+  "@debug"
+  "@error"
+  "@extend"
+  "@keyframes"
+  "@media"
+  "@mixin"
+  "@supports"
+  "@warn"
+] @constant.builtin
+
+[
+  "@import"
+  "@include"
+  "@forward"
+  "@use"
+] @keyword.control.import
+
+[
+  "@if"
+  "@else"
+] @keyword.control.conditional
+
+[
+  "@each"
+  "@for"
+  "@while"
+] @keyword.control.repeat
 
-"@apply" @constant.builtin
-"@at-root" @constant.builtin
-"@charset" @constant.builtin
-"@debug" @constant.builtin
-"@each" @keyword.control.repeat
-"@else" @keyword.control.conditional
-"@error" @constant.builtin
-"@extend" @constant.builtin
-"@for" @keyword.control.repeat
-"@forward" @keyword.control.import
-"@function" @function.method
-"@if" @keyword.control.conditional
-"@import" @keyword.control.import
-"@include" @keyword.control.import
-"@keyframes" @constant.builtin
-"@media" @constant.builtin
-"@mixin" @constant.builtin
-"@namespace" @namespace
 "@return" @keyword.control.return
-"@supports" @constant.builtin
-"@use" @keyword.control.import
-"@warn" @constant.builtin
-"@while" @keyword.control.repeat
+
+"@function" @function.method
+"@namespace" @namespace
 
 (property_name) @variable.other.member
 
@@ -58,10 +75,11 @@
 (pseudo_class_selector) @attribute
 
 (identifier) @variable
-(class_name) @variable
-(id_name) @variable
-(namespace_name) @variable
-(feature_name) @variable
+(class_name) @label
+(id_name) @label
+(namespace_name) @namespace
+
+(feature_name) @variable.other.member
 (variable) @variable
 (variable_name) @variable.other.member
 (variable_value) @variable.other.member
diff --git a/runtime/themes/onelight.toml b/runtime/themes/onelight.toml
index b812670d5..0f6961b33 100644
--- a/runtime/themes/onelight.toml
+++ b/runtime/themes/onelight.toml
@@ -162,7 +162,7 @@
 "ui.highlight" = { bg = "grey-300" }
 
 "ui.picker.header" = { fg = "purple"}
-"ui.picker.header.active" = { fg = "blue"}
+"ui.picker.header.column.active" = { fg = "blue"}
 
 "diagnostic.info" = { underline = { color = "blue", style = "dotted" } }
 "diagnostic.hint" = { underline = { color = "green", style = "dashed" } }