diff --git a/src/_afew b/src/_afew
index df2b336..dfe8b88 100644
--- a/src/_afew
+++ b/src/_afew
@@ -42,35 +42,35 @@ _afew() {
 
   _arguments -C \
     '(- 1 *)'-h"[Show help and exit]" \
-    "(-c -l -t -u -U -m)"-w"[Continuously monitor the mailbox for new messages matching the given query]" \
-    "(-c -l -w -u -U -m)"-t"[Run the tag filters]" \
-    "(-c -t -w -u -U -m)"-l"[Train category with the messages matching query]" \
-    "(-c -l -t -w -m)"-u"[Update the categories (requires no query)]" \
-    "(-c -l -t -w -m)"-U"[Update the reference category (takes quite some time) (requires no query)]" \
-    "(-l -t -w -u -U -m)"-c"[Classify each message matching the iven query]" \
-    "(-l -t -w -u -U -m)"-m"[Move mail files between maildir folders]" \
-    "(-n)"-a"[Operate on all email]" \
-    "(-a)"-n"[Operate on all new email]" \
-    -C"[Path to notmuch configuration file]:files:_files" \
-    -e"[Flter classes to use]:filters" \
-    -d"[Dont change the DB]" \
-    -R"[Size of the reference set (default: 1000)]:size:" \
-    -T"[Do not use emails older than DAYS days (default: 30)]:days:" \
-    -v"[Be more verbose]" \
+    "(-c --classify -l --learn= -t --tag -u --update -U --update-reference -m --move-mails)"{-w,--watch}"[Continuously monitor the mailbox for new messages matching the given query]" \
+    "(-c --classify -l --learn= -u --update -U --update-reference -m --move-mails -w --watch)"{-t,--tag}"[Run the tag filters]" \
+    "(-c --classify -t --tag -u --update -U --update-reference -m --move-mails -w --watch)"{-l,--learn=}"[Train category with the messages matching query]" \
+    "(-c --classify -l --learn= -t --tag -U --update-reference -m --move-mails -w --watch)"{-u,--update}"[Update the categories (requires no query)]" \
+    "(-c --classify -l --learn= -t --tag -u --update -m --move-mails -w --watch)"{-U,--update-reference}"[Update the reference category (takes quite some time) (requires no query)]" \
+    "(-l --learn= -t --tag -u --update -U --update-reference -m --move-mails -w --watch)"{-c,--classify}"[Classify each message matching the iven query]" \
+    "(-c --classify -l --learn= -t --tag -u --update -U --update-reference -w --watch)"{-m,--move-mails}"[Move mail files between maildir folders]" \
+    "(-n --all)"{-a,--all}"[Operate on all email]" \
+    "(-a --new)"{-n,--new}"[Operate on all new email]" \
+    {-C,--notmuch-config=}"[Path to notmuch configuration file]:files:_files" \
+    {-e,--enable-filters=}"[Flter classes to use]:filters" \
+    {-d,--dry-run}"[Dont change the DB]" \
+    {-R,--reference-set-size=}"[Size of the reference set (default: 1000)]:size:" \
+    {-T,--reference-set-timeframe-days=}"[Do not use emails older than DAYS days (default: 30)]:days:" \
+    {--verbose,-v}"[Be more verbose]" \
     '*:Query:' \
 
     case "$state" in
       (*)
         ;;
     esac
-  }
+}
 
-  _afew
+_afew
 
-  # Local Variables:
-  # mode: Shell-Script
-  # sh-indentation: 2
-  # indent-tabs-mode: nil
-  # sh-basic-offset: 2
-  # End:
-  # vim: ft=zsh sw=2 ts=2 et
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et