diff --git a/lockfile.json b/lockfile.json
index 1a8a7759e..6292b5cb9 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -426,7 +426,7 @@
     "revision": "07547525cdf4627343dca5891f1743ae45e879bb"
   },
   "smali": {
-    "revision": "a67a429784dafa0ca4342d71e6530137ca803883"
+    "revision": "b002dceb9b91a6d6de45479ab4b2e9596ebbaaf3"
   },
   "smithy": {
     "revision": "cf8c7eb9faf7c7049839585eac19c94af231e6a0"
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index bdcb464ae..4f810c293 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -5,7 +5,7 @@
 (primitive_type) @type.builtin
 
 ((class_identifier) @type.builtin
-  (#vim-match? @type.builtin "^L(android|com/android|dalvik|java)/"))
+  (#match? @type.builtin "^L(android|com/android|dalvik|java|kotlinx)/"))
 
 ; Methods
 
@@ -14,19 +14,17 @@
 
 (expression
   (opcode) @_invoke
-  (value
 	(body
 	  (full_method_signature
-        (method_signature (method_identifier) @method.call))))
+      (method_signature (method_identifier) @method.call)))
   (#lua-match? @_invoke "^invoke"))
 
 (method_handle
   (full_method_signature
 	(method_signature (method_identifier) @method.call)))
 
-(call_site) @method.call
-
 (custom_invoke
+  . (identifier) @method.call
   (method_signature (method_identifier) @method.call))
 
 (annotation_value
@@ -39,25 +37,23 @@
       (method_signature (method_identifier) @method.call))))
 
 (field_definition
-  (value
 	(body
-		(method_signature (method_identifier) @method.call))))
+		(method_signature (method_identifier) @method.call)))
 
 (field_definition
-  (value
 	(body
 	  (full_method_signature
-		(method_signature (method_identifier) @method.call)))))
+		  (method_signature (method_identifier) @method.call))))
 
-((method_signature
-  (method_identifier) @constructor)
+((method_identifier) @constructor
   (#any-of? @constructor "<init>" "<clinit>"))
 
 ; Fields
 
-(field_identifier) @field
-
-(annotation_key) @field
+[
+  (field_identifier)
+  (annotation_key)
+] @field
 
 ; Variables
 
@@ -86,7 +82,7 @@
   (#lua-match? @keyword.return "^return"))
 
 ((opcode) @conditional
-  (#vim-match? @conditional "^(if|cmp)"))
+  (#match? @conditional "^(if|cmp)"))
 
 ((opcode) @exception
   (#lua-match? @exception "^throw"))
@@ -128,9 +124,6 @@
   ".array-data"
   ".end array-data"
   ".enum"
-] @keyword
-
-[
   (prologue_directive)
   (epilogue_directive)
 ] @keyword
@@ -143,6 +136,7 @@
 ; Literals
 
 (string) @string
+(source_directive (string "\"" _ @text.uri "\""))
 (escape_sequence) @string.escape
 
 (character) @character
diff --git a/queries/smali/locals.scm b/queries/smali/locals.scm
index a91fec225..fcb3b631c 100644
--- a/queries/smali/locals.scm
+++ b/queries/smali/locals.scm
@@ -12,7 +12,6 @@
 [
   (identifier)
   (class_identifier)
-  (call_site)
   (label)
   (jmp_label)
 ] @reference
@@ -21,7 +20,7 @@
   (field_identifier) @definition.enum)
 
 ((field_definition
-  modifiers: (access_modifiers) @_mod
+  (access_modifiers) @_mod
   (field_identifier) @definition.enum)
   (#eq? @_mod "enum"))