Update

2 files changed, 17 insertions, 12 deletions

diff --git a/mutt/default b/mutt/default
index c254e5f..06673aa 100644
--- a/mutt/default
+++ b/mutt/default
@@ -61,6 +61,8 @@ bind index,browser l select-entry
 bind index \\ limit
 bind index \cj next-entry
 bind index \ck previous-entry
+bind pager \ce next-line
+bind pager \cy previous-line
 bind index,browser G last-entry
 bind index,browser g noop
 bind index,browser gg first-entry
@@ -119,6 +121,7 @@ bind generic                zt      current-top
 bind generic                zz      current-middle
 bind generic                zb      current-bottom
 bind index                  za      collapse-thread
+bind index                  zc      collapse-thread
 bind index                  zA      collapse-all
 #bind generic,pager          \Cy     previous-line
 #bind generic,index,pager    \Ce     next-line
diff --git a/mutt/muttrc.topo b/mutt/muttrc.topo
index ff39e8d..e3a1577 100644
--- a/mutt/muttrc.topo
+++ b/mutt/muttrc.topo
@@ -24,10 +24,11 @@ set mask="!(tmp|new|cur|dovecot.*|\\..*|maildirfolder)"
 
 # Sidebar
 mailboxes   -label 'INBOX' -poll + \
-            -poll +do \
-            -poll +on \
+            -poll +act\
             -poll +box \
+            -poll +continue \
             -poll -label '[r]' +river \
+            -poll -label '[h]' +hiking \
             "+-- Permanent ---" \
             -poll -label 'de[v]' +DEV \
             -poll -label '[t]alk 🍺' +talk \
@@ -48,23 +49,24 @@ macro index,pager <f3> '<sync-mailbox><enter-command>source ~/.config/mutt/muttr
 
 # Change mailboxes
 macro index,pager   gi      "<change-folder>+<Return>" "Switch to INBOX folder"
-macro index,pager   gd      "<change-folder>+do<Return>"
-macro index,pager   go      "<change-folder>+on<Return>"
+macro index,pager   ga      "<change-folder>+act<Return>"
 macro index,pager   gb      "<change-folder>+box<Return>"
-macro index,pager   gt      "<change-folder>+talk<Return>"
+macro index,pager   gc      "<change-folder>+continue<Return>"
+macro index,pager   gd      "<change-folder>+done<Return>"
 
-macro index,pager   gs      "<change-folder>+Sent<Return>"
-macro index,pager   gD      "<change-folder>+done<Return>"
-macro index,pager   gS      "<change-folder>+spam<Return>"
+macro index,pager   gt      "<change-folder>+talk<Return>"
 macro index,pager   gk      "<change-folder>+keep<Return>"
 macro index,pager   gn      "<change-folder>+news<Return>"
-
+macro index,pager   gh      "<change-folder>+hiking<Return>"
 macro index,pager   gp      "<change-folder>+pay<Return>"
+macro index,pager   gs      "<change-folder>+Sent<Return>"
+macro index,pager   gr      "<change-folder>+river<Return>"
+macro index,pager   gv      "<change-folder>+DEV<Return>"
+macro index,pager   gu      "<change-folder>+update<Return>"
+
 macro index,pager   gP      "<change-folder>+MISC/promote<Return>"
 macro index,pager   gT      "<change-folder>+Trash<Return>"
 macro index,pager   gl      "<change-folder>+login<Return>"
 macro index,pager   gf      "<change-folder>+feedback<Return>"
-macro index,pager   gr      "<change-folder>+river<Return>"
 macro index,pager   gR      "<change-folder>+rent<Return>"
-macro index,pager   gv      "<change-folder>+DEV<Return>"
-macro index,pager   gu      "<change-folder>+update<Return>"
+macro index,pager   gS      "<change-folder>+spam<Return>"