diff --git a/Makefile b/Makefile
index dbd29da..8d3c3c8 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 # To pick up grammar changes, bump the SHA below and run `make update-grammar`.
 # The refreshed grammar lands in the working tree, where a partial or wrong
 # download shows up as a diff before it can be committed.
-GRAMMAR_COMMIT := befa883ecec4b0c84e436bdd176dec5475e584ab
+GRAMMAR_COMMIT := f4d05bbfcd34342f76bcf135f7ae58ab7cd2dd58
 GRAMMAR := syntaxes/flix.tmLanguage.json
 
 .PHONY: build-site serve update-grammar
diff --git a/config.toml b/config.toml
index c2bdd53..b3b2d42 100644
--- a/config.toml
+++ b/config.toml
@@ -23,9 +23,13 @@ enabled = true
 style = "class"
 # The theme decides both the colours and -- since each span is named after the
 # theme rule that matched it, not after the grammar scope -- how finely the code
-# is split up. Catppuccin is the family tabi's own syntax stylesheet was derived
-# from; Mocha is its darkest member, near the value tabi gave code blocks before.
-theme = "catppuccin-mocha"
+# is split up. Two things are worth checking in a candidate, because neither is
+# visible from a screenshot of some other language: that no scope the Flix grammar
+# emits resolves back to the plain-text foreground, which is how Dracula renders
+# strings and Laserwave keywords -- unhighlighted, but only for grammars that lean
+# on that scope -- and that comments clear 3:1 against the code background, which
+# a fair number of the darker themes do not.
+theme = "rose-pine-moon"
 # The Flix grammar is not built in; `make` fetches it from flix/textmate.
 extra_grammars = ["syntaxes/flix.tmLanguage.json"]
 
diff --git a/syntaxes/flix.tmLanguage.json b/syntaxes/flix.tmLanguage.json
index fb8a0c7..9fb8d9e 100644
--- a/syntaxes/flix.tmLanguage.json
+++ b/syntaxes/flix.tmLanguage.json
@@ -15,6 +15,9 @@
         {
           "include": "#constants"
         },
+        {
+          "include": "#declarations"
+        },
         {
           "include": "#keywords"
         },
@@ -33,6 +36,9 @@
         {
           "include": "#annotations"
         },
+        {
+          "include": "#functions"
+        },
         {
           "include": "#types"
         },
@@ -45,7 +51,7 @@
       "patterns": [
         {
           "name": "constant.language.unit.flix",
-          "match": "\\b\\(\\)\\b"
+          "match": "(?<![a-zA-Z0-9_!])\\(\\)"
         },
         {
           "name": "constant.language.bool.flix",
@@ -73,16 +79,27 @@
         }
       ]
     },
+    "declarations": {
+      "patterns": [
+        {
+          "match": "\\b(def|redef)\\s+([a-z][a-zA-Z0-9_]*!?)",
+          "captures": {
+            "1": {
+              "name": "keyword.declaration.flix"
+            },
+            "2": {
+              "name": "entity.name.function.flix"
+            }
+          }
+        }
+      ]
+    },
     "keywords": {
       "patterns": [
         {
           "name": "keyword.control.choose.flix",
           "match": "\\b(choose\\*|choose)\\b"
         },
-        {
-          "name": "keyword.control.debug.flix",
-          "match": "\\b(dbg)\\b"
-        },
         {
           "name": "keyword.control.applicativefor.flix",
           "match": "\\b(forA)\\b"
@@ -109,16 +126,12 @@
         },
         {
           "name": "keyword.control.match.flix",
-          "match": "\\b(case|match|typematch|ematch)\\b"
+          "match": "\\b(case|match|ematch)\\b"
         },
         {
           "name": "keyword.control.run.flix",
           "match": "\\b(run)\\b"
         },
-        {
-          "name": "keyword.control.resume.flix",
-          "match": "\\b(resume)\\b"
-        },
         {
           "name": "keyword.control.throw.flix",
           "match": "\\b(throw)\\b"
@@ -139,10 +152,6 @@
           "name": "keyword.control.unsafe.flix",
           "match": "\\b(unsafe)\\b"
         },
-        {
-          "name": "keyword.control.ast.flix",
-          "match": "\\b(branch|jumpto)\\b"
-        },
         {
           "name": "keyword.forall.flix",
           "match": "\\b(forall)\\b"
@@ -161,7 +170,7 @@
         },
         {
           "name": "keyword.declaration.flix",
-          "match": "\\b(eff|def|redef|law|enum|case|type|alias|trait|instance|with|without|opaque|mod|struct|handler|xvar)\\b"
+          "match": "\\b(eff|def|redef|enum|type|alias|trait|instance|with|mod|struct)\\b"
         },
         {
           "name": "keyword.expression.cast.flix",
@@ -228,8 +237,12 @@
           "match": ";"
         },
         {
-          "name": "storage.type.modifier.flix",
-          "match": "\\b(lawful|pub|sealed|static)\\b"
+          "name": "variable.language.super.flix",
+          "match": "\\b(super)\\b"
+        },
+        {
+          "name": "storage.modifier.flix",
+          "match": "\\b(pub|sealed|static)\\b"
         }
       ]
     },
@@ -335,11 +348,30 @@
         }
       ]
     },
+    "functions": {
+      "patterns": [
+        {
+          "match": "\\b([A-Z][a-zA-Z0-9_]*)\\.([a-z][a-zA-Z0-9_]*!?)",
+          "captures": {
+            "1": {
+              "name": "entity.name.type.flix"
+            },
+            "2": {
+              "name": "support.function.flix"
+            }
+          }
+        },
+        {
+          "name": "entity.name.function.flix",
+          "match": "\\b[a-z][a-zA-Z0-9_]*!?(?=\\s*\\()"
+        }
+      ]
+    },
     "types": {
       "patterns": [
         {
-          "name": "entity.name.type",
-          "match": "\\b(Unit|Bool|Char|Float32|Float64|Int8|Int16|Int32|Int64|BigInt|String)\\b"
+          "name": "entity.name.type.flix",
+          "match": "\\b[A-Z][a-zA-Z0-9_]*\\b"
         }
       ]
     },