diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index de0aa378..b5526379 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -24,6 +24,7 @@ pgp-error-level           = warn
 pgp-key-id                = 965699C862DA92143CDE2877D1B0947B25420214
 
 [school]
+archive = archive
 source               = notmuch://~/.mail/
 maildir-store        = ~/.mail/
 maildir-account-path = school
diff --git a/.config/aerc/binds.conf b/.config/aerc/binds.conf
index 970df2e4..bcbbdfbc 100644
--- a/.config/aerc/binds.conf
+++ b/.config/aerc/binds.conf
@@ -70,7 +70,8 @@ zb = :align bottom<Enter>
 <Enter> = :view<Enter>
 d = :choose -o y 'Really delete this message' delete-message<Enter>
 D = :delete<Enter>
-a = :tag +archive<Enter>
+a = :tag +archive<Enter>:archive flat<Enter>
+# a = :echo hi<Enter>:echo hey<Enter>
 A = :unmark -a<Enter>:mark -T<Enter>:archive flat<Enter>
 
 C = :compose<Enter>
diff --git a/.config/aerc/personal-map.conf b/.config/aerc/personal-map.conf
index d2cdfd73..4eba0621 100644
--- a/.config/aerc/personal-map.conf
+++ b/.config/aerc/personal-map.conf
@@ -1,5 +1,5 @@
-InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:personal and not tag:git and not tag:srht
-SentNM=tag:sent and tag:personal
+InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:personal and not tag:git and not tag:srht and not (from:daniel@ficd.ca or from:ficcdaf@proton.me)
+SentNM=(from:daniel@ficd.ca or from:ficcdaf@proton.me)
 to-me=tag:to-me and tag:personal
 sr.ht=tag:inbox and tag:srht and tag:personal
 git=tag:inbox and tag:git and tag:personal
diff --git a/.config/aerc/school-map.conf b/.config/aerc/school-map.conf
index c4f08a14..908744c3 100644
--- a/.config/aerc/school-map.conf
+++ b/.config/aerc/school-map.conf
@@ -1,4 +1,4 @@
-InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:school and not tag:git and not tag:srht
+InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:school and not tag:git and not tag:srht and not (from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca)
 SentNM=tag:sent and tag:school and (from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca)
 to-me=tag:to-me and tag:school
 # sr.ht=tag:inbox and tag:srht