diff --git a/office/.config/neomutt/maps b/office/.config/neomutt/maps
index da5854d..fd86c50 100644
--- a/office/.config/neomutt/maps
+++ b/office/.config/neomutt/maps
@@ -21,9 +21,9 @@ bind  index,pager                w   display-toggle-weed
 
 # Thread manipulation
 bind pager d noop
-bind index,pager    dd delete-message
-bind index,pager    dT delete-thread
-bind index,pager    dt delete-subthread
+bind index,pager    dD delete-message
+bind index,pager    dd delete-subthread
+bind index,pager    dt delete-thread
 bind pager,index    gt next-thread
 bind pager,index    gT previous-thread
 bind pager,index    za collapse-thread
@@ -31,15 +31,15 @@ bind pager,index    zA collapse-all
 bind pager,index    zr reconstruct-thread
 bind pager,index    zR entire-thread
 # Saner copy/move dialogs
-macro index,pager   C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
-macro index,pager   M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
-macro index,pager   gM "<tag-thread><tag-prefix><save-message>?<toggle-mailboxes>" "move thread to a mailbox"
+macro index,pager   ,c "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
+macro index,pager   ,m "<tag-thread><tag-prefix><save-message>?<toggle-mailboxes>" "move thread to a mailbox"
+macro index,pager   ,M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
 
 # Email completion bindings
 bind editor <Tab> complete-query
 bind editor ^T complete
 # Press A to add contact to Khard address book
-macro index,pager A \
+macro index,pager ,a \
     "<pipe-message>khard add-email<return>" \
     "add the sender email address to khard"
 
@@ -69,14 +69,14 @@ bind pager G  bottom
 # compose postpone
 bind compose p postpone-message
 # markdown to html for composition
-macro compose M "F pandoc -s -f markdown -t html \ny^T^Utext/html; charset=UTF-8\n" "Convert from MD to HTML"
+macro compose ,m "F pandoc -s -f markdown -t html \ny^T^Utext/html; charset=UTF-8\n" "Convert from MD to HTML"
 
 # since we unbound the original g
 bind  index,pager r   noop              # to avoid accidentally sending replies
 bind  index,pager rr  group-reply
 bind  index,pager ro  reply
 # open urls found in the e-mail
-macro index,pager \CU "|urlview<enter>" "call urlview to open links"
+macro index,pager \CU "<enter-command> unset pipe_decode<enter><pipe-message>extract_url | fzf | clip<enter>" "get URLs"
 
 # Refresh far imap email
 macro index O "<sync-mailbox><shell-escape>export MBSYNC_PRE=true; sync-mail<enter><sync-mailbox>" "refresh all e-mail"
@@ -84,5 +84,5 @@ macro index o "<sync-mailbox><shell-escape>export MBSYNC_PRE=true; sync-mail gma
 
 
 # Send mail to taskwarrior
-macro index,pager T "<pipe-message>mutt2task -c -d -t<enter>" "add mail as task to taskwarrior with custom description and tags"
-macro index,pager t "<pipe-message>mutt2task -c<enter>" "add mail as task to taskwarrior"
+macro index,pager ,T "<pipe-message>mutt2task -c -d -t<enter>" "add mail as task to taskwarrior with custom description and tags"
+macro index,pager ,t "<pipe-message>mutt2task -c<enter>" "add mail as task to taskwarrior"