diff --git a/queries/forester/highlights.scm b/queries/forester/highlights.scm
index be33259..c647930 100644
--- a/queries/forester/highlights.scm
+++ b/queries/forester/highlights.scm
@@ -1,20 +1,51 @@
-"transclude" @keyword
-"title" @field
-"date" @field
-"taxon" @field
-"ul" @field
-"ol" @field
-"li" @field
-"p" @field
-"code" @field
+[
+ "{"
+ "}"
+ "("
+ ")"
+ "["
+ "]"
+ "\\"
+]
+@punctuation.delimiter
+
+[
+  "transclude" 
+  "import" 
+  "export"
+]
+@include
+
+[
+"title"
+"date"
+"taxon"
+] @field
+
+[
+"ul" 
+"ol"
+"li"
+"p"
+"code"
+]@function.builtin
+
+
+"tag" @tag
+
 "def" @define
 "object" @lsp.type.class
 "scope" @field
 "put" @keyword
 "query" @keyword
 
-(ident) @field
-(addr) @text.underline
-(link_label) @label
-(link_dest) @text.underline @variable
+(ident) @function
+;;(identifier) @field
+;;(arg) @variable
+(em (text)) @text.emphasis
+(addr) @underline 
+(label) @text.uri
+(title (_)* @text.title)
+(date (_)* @text.title)
+(link_dest dest: (_) @variable)
 (external_link) @text.underline
diff --git a/queries/forester/links.scm b/queries/forester/links.scm
new file mode 100644
index 0000000..e69de29