diff --git a/extension.toml b/extension.toml
index 7bea85c..7e91f97 100644
--- a/extension.toml
+++ b/extension.toml
@@ -8,4 +8,4 @@ repository = "https://git.hibas.dev/hibas123/jrpc-syntax-zed"
 
 [grammars.jrpc]
 repository = "https://git.hibas.dev/hibas123/tree-sitter-jrpc"
-commit = "69a6f0444e0c52384d8b252e1c226565eec72c4f"
+commit = "6763d967af5d748cc86fdcb97ab8f609a9b69c2c"
diff --git a/languages/jrpc/config.toml b/languages/jrpc/config.toml
index e32fb0b..2590329 100644
--- a/languages/jrpc/config.toml
+++ b/languages/jrpc/config.toml
@@ -2,3 +2,4 @@ name = "JRPC"
 grammar = "jrpc"
 path_suffixes = ["jrpc"]
 line_comments = ["// "]
+brackets = [{ start = "{", end = "}", close = true, newline = true }]
diff --git a/languages/jrpc/highlights.scm b/languages/jrpc/highlights.scm
index 86d0b87..07e0c1f 100644
--- a/languages/jrpc/highlights.scm
+++ b/languages/jrpc/highlights.scm
@@ -1,4 +1,33 @@
+[
+    "import"
+    "define"
+    "type"
+    "enum"
+    "service"
+    "notification"
+] @keyword
+
+(type) @type
+
+(import_declaration source: (string) @string)
+
+(define_declaration key: (identifier) @type.definition)
+
+(type_declaration name: (identifier) @type.definition)
+
+(attribute (pair key: (identifier) @attribute))
+
+(enum_declaration name: (identifier) @type.definition)
+(enum_value_declaration) @enum
+(enum_value_assignment (identifier) @enum)
+(enum_value_assignment (number) @number)
+
+(service_declaration name: (identifier) @type.definition)
+(function_decorator name: (identifier) @comment)
+(service_function name: (identifier) @function)
+(function_argument name: (identifier) @attribute)
+(service_notification name: (identifier) @function)
+
+
 (string) @string
 (number) @number
-(pair
-    key: (string) @property.name)
diff --git a/languages/jrpc/indents.scm b/languages/jrpc/indents.scm
deleted file mode 100644
index 093421d..0000000
--- a/languages/jrpc/indents.scm
+++ /dev/null
@@ -1 +0,0 @@
-(object "}" @end) @indent