diff --git a/afew/config b/afew/config
index 1afe4cd..32642b1 100644
--- a/afew/config
+++ b/afew/config
@@ -2,21 +2,69 @@
 #[ClassifyingFilter]
 [KillThreadsFilter]
 [ListMailsFilter]
-[ArchiveSentMailsFilter]
+[ArchiveSentMailsFilter] # Looks for mails sent from my addresses, adds sent tag
 
-#[Filter.1]
-#message = Tagging IOCOM netmon emails
-#query = to:netmon@insors.com
-#tags = +netmon;-new
-
-[FolderNameFilter]
-folder_blacklist = iocom/INBOX
-folder_transforms = Archive:archive Drafts:drafts Sent:sent Trash:trash Builder:builder Info:info Netmon:netmon Spam:spam
+#[FolderNameFilter]
+#folder_blacklist = iocom/INBOX gmail/INBOX gmail/[Gmail].Important gmail/[Gmail].Starred
+#folder_transforms = Archive:archive Drafts:drafts Sent:sent Trash:trash Builder:builder Info:info Netmon:netmon Spam:spam "gmail/Kara Hetz":"Kara Hetz" "All Mail":archive "gmail/[Gmail].Drafts":drafts "gmail/[Gmail].Sent Mail":sent "Spam":spam "Important":important "gmail/[Gmail].Trash":trash
+# This is getting nasty. Let's just use filters
 
 [Filter.1]
-message = Removing archived mails from inbox
-query = tag:archive
-tags = -new;-archive
+message = Gmail
+query = folder:gmail
+tags = +gmail
+
+[Filter.2]
+message = IOCOM
+query = folder:iocom
+tags = +iocom
+
+[Filter.3]
+message = Archived
+query = folder:iocom/INBOX.Archive OR 'folder:"gmail/[Gmail].All Mail"'
+tags = -new;-inbox
+
+[Filter.4]
+message = Drafts
+query = folder:iocom/INBOX.Drafts OR 'folder:"gmail/[Gmail].Drafts"'
+tags = -new;+drafts
+
+[Filter.5]
+message = Sent
+query = folder:iocom/INBOX.Sent OR 'folder:"gmail/[Gmail].Sent Mail"'
+tags = -new;+sent
+
+[Filter.6]
+message = Spam
+query = folder:iocom/INBOX.spam OR 'folder:"gmail/[Gmail].Spam"'
+tags = -new;+spam
+
+[Filter.7]
+message = Trash
+query = folder:iocom/INBOX.Trash OR 'folder:"gmail/[Gmail].Trash"'
+tags = -new;+trash
+
+# IOCOM folders
+
+[Filter.8]
+message = Builder
+query = folder:iocom/INBOX.builder
+tags = +builder;-spam;-new
+
+[Filter.9]
+message = Netmon
+query = folder:iocom/INBOX.netmon
+tags = +netmon;-spam;-new
+
+# IOCOM tags
+
+[Filter.10]
+message = Bugzilla
+query = from:bugzilla-daemon@bugzilla.insors.net
+tags = +bugzilla
+
+# Gmail folders (what Gmail calls tags) TODO
+
 
 [InboxFilter]
 
@@ -26,3 +74,5 @@ max_age = 15
 
 iocom/INBOX/ = 'NOT tag:inbox':iocom/INBOX.Archive/
 iocom/INBOX.Archive/ = 'tag:inbox':iocom/INBOX/
+
+# TODO All folders <-> tags
diff --git a/alot/config b/alot/config
index ebafb3d..ffb3cb2 100644
--- a/alot/config
+++ b/alot/config
@@ -17,3 +17,8 @@ tabwidth = 4
         gpg_key = 2B3A6377
         sendmail_command = msmtp --account=DustinswanGmail -t
         # sent_tags = sent
+
+[bindings]
+    [[search]]
+    'I I' = search tag:iocom AND tag:inbox
+    'G G' = search tag:gmail AND tag:inbox
diff --git a/bin/check_mail.sh b/bin/check_mail.sh
index 2912a46..4fc2fa6 100755
--- a/bin/check_mail.sh
+++ b/bin/check_mail.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 while true; do
-    few -m; mbsync iocom; notmuch new
+    few -m; mbsync -a; notmuch new
     sleep 45
 done
diff --git a/bootstrap-mac.sh b/bootstrap-mac.sh
index e1890d2..7119e80 100644
--- a/bootstrap-mac.sh
+++ b/bootstrap-mac.sh
@@ -36,7 +36,7 @@ brew install ruby-install
 brew install python --with-brewed-openssl
 brew install macvim --HEAD --override-system-vim
 brew install msmtp
-brew install mutt
+brew install watch
 brew install urlview
 brew install isync
 brew install mosh
diff --git a/mbsyncrc b/mbsyncrc
index 57e6d26..f07b3c2 100644
--- a/mbsyncrc
+++ b/mbsyncrc
@@ -2,7 +2,6 @@ IMAPAccount gmail
 Host imap.gmail.com
 User dustinswan@gmail.com
 PassCmd "gpg -d ~/.gmail-password.gpg"
-# SSL
 UseIMAPS yes
 #CertificateFile ~/.mail/gmail.pem
 
@@ -13,11 +12,11 @@ Account gmail
 MaildirStore gmail-local
 Path ~/.mail/gmail/
 Inbox ~/.mail/gmail/INBOX
+Flatten .
 
 Channel gmail
 Master :gmail-remote:
 Slave :gmail-local:
-#Path "[Gmail]."
 # Include everything
 Patterns *
 # Automatically create missing mailboxes, both locally and on the server
@@ -32,7 +31,6 @@ IMAPAccount iocom
 Host secure.emailsrvr.com
 User dswan@insors.com
 PassCmd "gpg -d ~/.iocom-password.gpg"
-# SSL
 UseIMAPS yes
 
 IMAPStore iocom-remote
diff --git a/notmuch-config b/notmuch-config
index 8aae0ce..3632f09 100644
--- a/notmuch-config
+++ b/notmuch-config
@@ -61,7 +61,7 @@ ignore=
 #		query will override that exclusion.
 #
 [search]
-exclude_tags=deleted;spam;
+#exclude_tags=deleted;spam;
 
 # Maildir compatibility configuration
 #