     "g?" 'notmuch-help
     "q" 'notmuch-bury-or-kill-this-buffer
     "s" 'notmuch-search
-    "z" 'notmuch-tree
+    "S" 'notmuch-tree
     "C" 'notmuch-mua-new-mail           ; like mu4e
     "cc" 'notmuch-mua-new-mail          ; like mu4e
     "gr" 'notmuch-refresh-this-buffer
-    "gR" 'notmuch-refresh-all-buffers
-    "Z" 'notmuch-poll-and-refresh-this-buffer
+    "gA" 'notmuch-refresh-all-buffers
+    "gR" 'notmuch-poll-and-refresh-this-buffer
     "J" 'notmuch-jump-search)
 
   (evil-collection-define-key 'normal 'notmuch-hello-mode-map

    "cc" 'notmuch-mua-new-mail          ; like mu4e
    "cR" 'notmuch-show-reply
    "X" 'notmuch-show-archive-thread-then-exit
    "Z" 'notmuch-tree-from-show-current-query
    "a" 'notmuch-show-archive-message-then-next-or-next-thread
    "d" 'evil-collection-notmuch-show-toggle-delete
    "=" 'evil-collection-notmuch-show-toggle-flagged

      "cr" 'notmuch-search-reply-to-thread-sender
      "cR" 'notmuch-search-reply-to-thread
      "t" 'notmuch-search-filter-by-tag
      "y" 'notmuch-search-stash-map
      [mouse-1] 'notmuch-search-show-thread
      "-" 'notmuch-search-remove-tag
      "+" 'notmuch-search-add-tag
