diff --git a/queries/nu/folds.scm b/queries/nu/folds.scm
new file mode 100644
index 000000000..53607745a
--- /dev/null
+++ b/queries/nu/folds.scm
@@ -0,0 +1,10 @@
+[
+  (attribute_list)
+  (block)
+  (command_list)
+  (parameter_bracks)
+  (record_body)
+  (val_list)
+  (val_table)
+  (val_closure)
+] @fold
diff --git a/queries/nu/highlights.scm b/queries/nu/highlights.scm
index 90a434eff..f8342fab4 100644
--- a/queries/nu/highlights.scm
+++ b/queries/nu/highlights.scm
@@ -275,16 +275,15 @@ key: (identifier) @property
 (param_cmd
   (cmd_identifier) @string)
 
-(param_long_flag
-  (long_flag_identifier) @attribute)
+(attribute
+  "@" @attribute)
 
-(param_short_flag
-  (param_short_flag_identifier) @attribute)
-
-(short_flag
-  (short_flag_identifier) @attribute)
-
-(long_flag_identifier) @attribute
+[
+  (attribute_identifier)
+  (long_flag_identifier)
+  (param_short_flag_identifier)
+  (short_flag_identifier)
+] @attribute
 
 (scope_pattern
   (wild_card) @function)