diff --git a/bootstrap/packages.txt b/bootstrap/packages.txt
index 11f8a11..7b1335b 100644
--- a/bootstrap/packages.txt
+++ b/bootstrap/packages.txt
@@ -1,4 +1,5 @@
 aerc
+afew
 alacritty
 an2linuxserver-git
 anki
@@ -33,7 +34,6 @@ glances
 glow
 gnome-keyring
 go
-gopass
 grub
 hugo
 i3-gaps
@@ -78,6 +78,7 @@ ntp
 os-prober
 pacman-contrib
 pandoc-citeproc
+pass
 pavolume
 pdfjs
 pia-tools
diff --git a/mail/.config/aerc/binds.conf b/mail/.config/aerc/binds.conf
index e39cf31..5e5609e 100644
--- a/mail/.config/aerc/binds.conf
+++ b/mail/.config/aerc/binds.conf
@@ -23,17 +23,15 @@ k = :prev<Enter>
 gg = :select 0<Enter>
 G = :select -1<Enter>
 
-J = :next-folder<Enter>
+c = :cf<space>
 <C-n> = :next-folder<Enter>
-K = :prev-folder<Enter>
 <C-p> = :prev-folder<Enter>
-gi = :cf Inbox<Enter>
-g' = :cf Important<Enter>
-' = :cf Important<Enter>
-ga = :cf Archive<Enter>
-gA = :cf All<Enter>
-gs = :cf Sent<Enter>
-gt = :cf Trash<Enter>
+'' = :cf Inbox<Enter>
+'i = :cf Important<Enter>
+'a = :cf Archive<Enter>
+'A = :cf All<Enter>
+'s = :cf Sent<Enter>
+'t = :cf Trash<Enter>
 
 v = :mark -t<Enter>
 V = :mark -v<Enter>
@@ -41,11 +39,12 @@ V = :mark -v<Enter>
 <Enter> = :view<Enter>
 l = :view<Enter>
 D = :prompt 'Really delete this message?' 'delete-message'<Enter>
-i = :modify-labels +inbox -archived -deleted<Enter>
-m = :modify-labels +flagged<Enter>
-d = :modify-labels +deleted -inbox -archived<Enter>
-a = :modify-labels +archived -deleted -inbox<Enter>
-A = :modify-labels +archived -deleted -inbox<Enter>
+mi = :modify-labels +inbox -archived -deleted<Enter>
+mm = :modify-labels +flagged<Enter>
+mI = :modify-labels +flagged<Enter>
+md = :modify-labels +deleted -inbox<Enter>
+mD = :modify-labels -deleted <Enter>
+ma = :modify-labels -deleted -inbox<Enter>
 
 C = :compose<Enter>
 
@@ -54,7 +53,6 @@ rq = :reply -aq<Enter>
 Rr = :reply<Enter>
 Rq = :reply -q<Enter>
 
-c = :cf<space>
 $ = :term<space>
 ! = :term<space>
 | = :pipe<space>
diff --git a/mail/.config/aerc/notmuch-querymap b/mail/.config/aerc/notmuch-querymap
index 08f54e9..924c80e 100644
--- a/mail/.config/aerc/notmuch-querymap
+++ b/mail/.config/aerc/notmuch-querymap
@@ -1,9 +1,7 @@
 All=*
-Inbox=tag:inbox and not tag:archived and not tag:dump
-Archive=tag:archived and not tag:inbox and not tag:dump
+Inbox=tag:inbox and not tag:lists
+Archive=not tag:inbox and not tag:deleted and not tag:dump
 Dump=tag:dump and not tag:inbox
 Trash=tag:deleted
 Important=tag:flagged
 Sent=from:marty.oehme@gmail.com or from:marty.oehme@googlemail.com or from:moehme@ruc.dk or from:mo82rimu@studserv.uni-leipzig.de
-Replied=tag:replied
-Patches=subject:/^\[PATCH/
diff --git a/mail/.config/afew/config b/mail/.config/afew/config
new file mode 100644
index 0000000..3aabf78
--- /dev/null
+++ b/mail/.config/afew/config
@@ -0,0 +1,6 @@
+[SpamFilter]
+[KillThreadsFilter]
+[ListMailsFilter]
+[ArchiveSentMailsFilter]
+sent_tag=sent
+[InboxFilter]
diff --git a/mail/.config/imapfilter/filters/rollup-dump.lua b/mail/.config/imapfilter/filters/rollup-dump.lua
index 2fd8290..3004578 100644
--- a/mail/.config/imapfilter/filters/rollup-dump.lua
+++ b/mail/.config/imapfilter/filters/rollup-dump.lua
@@ -1,22 +1,16 @@
-function sendtoRollup(acc, senders)
+function sendToFolder(folderFrom, folderTo, senders)
 
   for _, sender in pairs(senders) do
-    messages = acc["Inbox"]:contain_from(sender)
+    messages = folderFrom:contain_from(sender)
     messages:mark_seen()
-    messages:move_messages(acc["Dump"])
-
-    -- for _, msg in ipairs(messages) do
-    --   mailbox, uid = table.unpack(msg)
-    --   local from = mailbox[uid]:fetch_field("From")
-    --   local subject = mailbox[uid]:fetch_field("Subject")
-    --   print(from .. "; " .. subject)
-    -- end
+    messages:move_messages(folderTo)
   end
 
 end
 
 for _, acc in pairs(accounts) do
-  sendtoRollup ( acc, {
+  sendToFolder ( acc["Inbox"], acc["Dump"],
+    {
     "news@todoist.com",
     "server@email.woommart.com",
     "noreply@medium.com",
@@ -34,6 +28,8 @@ for _, acc in pairs(accounts) do
     "waitlist@isthereanydeal.com",
     "info@mynameisgriz.com",
     "news@postman.com",
-
+    "no-reply@tumblr.com",
+    "contact@mailer.humblebundle.com",
+    "info@audible.de"
   })
 end
diff --git a/mail/.config/notmuch/config b/mail/.config/notmuch/config
index f898572..5ef4671 100644
--- a/mail/.config/notmuch/config
+++ b/mail/.config/notmuch/config
@@ -48,7 +48,7 @@ other_email=mo82rimu@studserv.uni-leipzig.de;moehme@ruc.dk;
 #		in the mail store.
 #
 [new]
-tags=unread;inbox;
+tags=new
 ignore=
 
 # Search configuration