diff --git a/mail/.config/afew/config b/mail/.config/afew/config
index 0366190..ce80bb6 100644
--- a/mail/.config/afew/config
+++ b/mail/.config/afew/config
@@ -5,76 +5,79 @@
 [ListMailsFilter]
 [MeFilter]
 [ArchiveSentMailsFilter]
+[InboxFilter]
 sent_tag = sent
 
+
 # add specific tags
 
 [Filter.0]
-query = 'subject:alot'
-tags = +alot
-message = alot mails
+query = 'to:colin.powell@15five.com'
+tags = +15five;+work
+message = 15Five message
 
 [Filter.1]
-query = 'to:notmuch@notmuchmail.org AND (subject:emacs OR subject:elisp OR "(defun" OR "(setq" OR PATCH)'
-tags = -inbox;-new;+notmuch
-message = notmuch emacs stuff
+query = 'to:colin@castine.town'
+tags = +muni
+message = Selectboard message
 
-# Sentry errors, skip the inbox, tag as sentry
 [Filter.2]
-query = 'from:noreply@md.getsentry.com'
-tags = +sentry;+15five;-unread
-message = sentry error
+query = 'to:colin@unbl.ink'
+tags = +personal
+message = Personal message
 
 # Jira tag as Jira
 [Filter.3]
 query = 'from:jira@15five-dev.atlassian.net'
-tags = +jira;-inbox;+15five;-unread
-message = jira message
+tags = +jira;-inbox
+message = Jira message
 
 # Orgmode
 [Filter.4]
-query = 'to:emacs-orgmode@gnu.org'
-tags = +orgmode;-inbox;-unread
+query = 'emacs-orgmode'
+tags = -new;-inbox;+orgmode
 message = orgmode message
 
 # Delete some spam
 [Filter.5]
-query = '\'Office365 Message Center\' via Developers OR from:admin@darntough.com OR from:govdelivery@subscriptions.defense.gov OR from:notifications@facebookmail.com OR from:MPP@em.home.dell.com OR from:info@jaimeharrison.com'
-tags = +spam;-inbox;-unread
+query = '\'Office365 Message Center\' via Developers OR from:admin@darntough.com OR from:govdelivery@subscriptions.defense.gov OR from:notifications@facebookmai.com OR from:MPP@em.home.dell.com'
+tags = -inbox;+spam
 message = spam message
 
 # Tag interview emails
 [Filter.6]
 query = 'subject:Interview'
-tags = +interview;-inbox;-unread
+tags = -inbox;+interview
 message = personal message
 
 # F5bot - not quite spam, but I don't want to see it
 [Filter.8]
 query = 'from:admin@f5bot.com'
-tags = +f5;-inbox;-unread
+tags = -inbox;-new;+f5
 message = f5 message
 
 # Emacs Conf
 [Filter.9]
 query = 'to:emacsconf-discuss@gnu.org'
-tags = +emacsconf;-inbox
+tags = -inbox;-new;+emacsconf
 message = emacsconf message
 
-# Github notifications
+# Sentry errors, skip the inbox, tag as sentry
 [Filter.10]
+query = 'from:noreply@md.getsentry.com'
+tags = -inbox;-new;+sentry
+message = sentry error
+
+[Filter.11]
 query = 'from:notifications@github.com'
-tags = +github;-inbox
-message = github message
+tags = -inbox;+github
+message = Github message
 
 [MailMover]
-folders = Inbox Junk Archive Sent
+folders = INBOX Junk Archive Sent
 rename = True
 max_age = 45
-Inbox = 'tag:spam':Junk 'NOT tag:inbox':Archive 'tag:deleted':Trash 'tag:sent':Sent
-Archive = 'tag:inbox':Inbox 'tag:deleted':Trash
-Sent = 'tag:inbox':Inbox 'tag:deleted':Trash
-Junk = 'NOT tag:spam AND tag:inbox':Inbox 'NOT tag:spam':Archive
-
-# what's still new goes into the inbox
-[InboxFilter]
+INBOX = 'tag:spam':Junk 'NOT tag:inbox':Archive 'tag:deleted':Trash 'tag:sent':Sent
+Archive = 'tag:inbox':INBOX 'tag:deleted':Trash
+Sent = 'tag:inbox':INBOX 'tag:deleted':Trash
+Junk = 'NOT tag:spam AND tag:inbox':INBOX 'NOT tag:spam':Archive