diff --git a/roles/neomutt/templates/neomuttrc.j2 b/roles/neomutt/templates/neomuttrc.j2
index a585daf..96821c7 100644
--- a/roles/neomutt/templates/neomuttrc.j2
+++ b/roles/neomutt/templates/neomuttrc.j2
@@ -24,46 +24,39 @@ unset imap_passive              # open imap connection when checking for mail
 #auto_view application/pgp-encrypted
 #alternative_order text/plain text/enriched text/html
 
-#bind index,pager i noop
-#bind index,pager g noop
+bind index,pager i noop
+bind index,pager g noop
 #bind index \Cf noop
 #bind index,pager M noop
 #bind index,pager C noop
 
 # General rebindings
-#bind index gg first-entry
-#bind index j next-entry
-#bind index k previous-entry
-#bind attach <return> view-mailcap
-#bind attach l view-mailcap
-#bind editor <space> noop
-#bind index G last-entry
-#bind index gg first-entry
-#bind pager,attach h exit
-#bind pager j next-line
-#bind pager k previous-line
-#bind pager l view-attachments
-#bind index D delete-message
-#bind index U undelete-message
+bind index gg first-entry
+bind pager,browser gg top-page
+bind index G last-entry
+bind pager,browser G bottom-page
+bind index h noop
+bind pager,attach h exit
+#bind browser h goto-parent
+macro browser h '<change-dir><kill-line>..<enter>' "Go to parent folder"
+bind index j next-entry
+bind pager j next-line
+bind index k previous-entry
+bind pager k previous-line
+bind index l display-message
+bind pager l view-attachments
+bind attach l view-mailcap
+bind attach <return> view-mailcap
+bind browser l select-entry
+bind index D delete-message
+bind index U undelete-message
+bind editor <space> noop
 #bind index L limit
-#bind index h noop
-#bind index l display-message
-#bind index,query <space> tag-entry
-##bind browser h goto-parent
-#macro browser h '<change-dir><kill-line>..<enter>' "Go to parent folder"
+bind index,query <space> tag-entry
 #bind index,pager H view-raw-message
-#bind browser l select-entry
-#bind pager,browser gg top-page
-#bind pager,browser G bottom-page
-#bind index,pager,browser d half-down
-#bind index,pager,browser u half-up
-#bind index,pager S sync-mailbox
-#bind index,pager R group-reply
-#bind index \031 previous-undeleted     # Mouse wheel
-#bind index \005 next-undeleted         # Mouse wheel
-#bind pager \031 previous-line          # Mouse wheel
-#bind pager \005 next-line              # Mouse wheel
-#bind editor <Tab> complete-query
+bind index,pager S sync-mailbox
+bind index,pager R group-reply
+bind editor <Tab> complete-query
 
 #macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
 #macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
@@ -182,7 +175,7 @@ color sidebar_flagged red black
 {% for account in accounts %}
 source ~/.config/neomutt/accounts/{{ account.fulladdress }}.neomuttrc
 folder-hook $folder source ~/.config/neomutt/accounts/{{ account.fulladdress }}.neomuttrc
-macro index,pager <f{{ loop.index }}> '<sync-mailbox><enter-command>source ~/.config/neomutt/accounts/{{ account.fulladdress }}.neomuttrc<enter><change-folder>!<enter>;<check-stats>' "switch to {{ account.fulladdress }}"
+macro index,pager i{{ loop.index }} '<sync-mailbox><enter-command>source ~/.config/neomutt/accounts/{{ account.fulladdress }}.neomuttrc<enter><change-folder>!<enter>;<check-stats>' "switch to {{ account.fulladdress }}"
 
 {% endfor %}
 #macro index 'c' '<change-folder>?<change-dir><home>=<enter>'