diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index 40da78bb..0bf5c373 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -15,7 +15,7 @@ source-cred-cmd   = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-tes
 outgoing          = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587
 outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test
 from              = Daniel Fichtinger <fichtinger.d@queensu.ca>
-default           = Inbox
+default           = INBOX
 copy-to           = Sent
 signature-file    = /home/fic/mail/fichtinger.d@queensu.ca.sig
 
@@ -26,7 +26,7 @@ maildir-account-path = personal
 query-map = ~/.config/aerc/personal-map.conf
 outgoing          = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025
 outgoing-cred-cmd = pass show proton/bridge
-default           = INBOX
+default           = InboxNM
 from              = Daniel Fichtinger <daniel@ficd.ca>
 copy-to           = Sent
 cache-headers     = true
@@ -41,7 +41,7 @@ maildir-account-path = school
 query-map = ~/.config/aerc/school-map.conf
 outgoing          = smtp+xoauth2://18daf3%40queensu.ca@outlook.office365.com:587
 outgoing-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test
-default           = Inbox
+default           = InboxNM
 from              = Daniel Fichtinger <fichtinger.d@queensu.ca>
 copy-to           = Sent
 signature-file    = /home/fic/mail/fichtinger.d@queensu.ca.sig
diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index f8a9c02e..6d19eee3 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -397,7 +397,7 @@ reverse-thread-order=true
 # (IMAP server or notmuch), threads will be built by the client.
 #
 # Default: false
-threading-enabled=true
+# threading-enabled=true
 
 # Force client-side thread building
 #
diff --git a/.config/aerc/binds.conf b/.config/aerc/binds.conf
index 2ded08d0..96ac38ce 100644
--- a/.config/aerc/binds.conf
+++ b/.config/aerc/binds.conf
@@ -20,7 +20,8 @@ I = :next-tab<Enter>
 o = :exec /home/fic/.config/aerc/mail-sync.sh<Enter>
 q = :prompt 'Quit?' quit<Enter>
 
-t = :flag -t -x<space><tab>
+t = :toggle-threads<Enter>
+T = :flag -t -x<space><tab>
 mr = :read<Enter>
 mu = :unread<Enter>
 
diff --git a/.config/aerc/personal-map.conf b/.config/aerc/personal-map.conf
index a93dc78e..0df38834 100644
--- a/.config/aerc/personal-map.conf
+++ b/.config/aerc/personal-map.conf
@@ -1,2 +1,2 @@
-Inbox=tag:inbox and not tag:archived and not tag:deleted and tag:personal
-Sent=from:daniel@ficd.ca or from:ficcdaf@proton.me or from:isafic@proton.me
+InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:personal
+SentNM=from:daniel@ficd.ca or from:ficcdaf@proton.me or from:isafic@proton.me
diff --git a/.config/aerc/school-map.conf b/.config/aerc/school-map.conf
index f3685626..c3dd60d1 100644
--- a/.config/aerc/school-map.conf
+++ b/.config/aerc/school-map.conf
@@ -1,2 +1,2 @@
-Inbox=tag:inbox and not tag:archived and not tag:deleted and tag:school
-Sent=from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca
+InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:school
+SentNM=from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca
diff --git a/.config/imapnotify/.helix/languages.toml b/.config/imapnotify/.helix/languages.toml
deleted file mode 100644
index 4b1155c7..00000000
--- a/.config/imapnotify/.helix/languages.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[[language]]
-name = "json"
-file-types = [
-"conf"
-]
diff --git a/.config/imapnotify/outlook.yaml b/.config/imapnotify/outlook.yaml
deleted file mode 100644
index ce1e35ee..00000000
--- a/.config/imapnotify/outlook.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-host: outlook.office365.com
-port: 993
-tls: true,
-tlsOptions:
-  rejectUnauthorized: true
-  starttls: true
-username: 18daf3@queensu.ca
-passwordCMD: '~/tools/mutt_oauth2.py ~/tools/tokenfile-test'
-xoAuth2: true
-onNewMail: '/home/fic/.config/aerc/mail-sync.sh'
-wait: 20
-boxes:
-  -
-    mailbox: INBOX
-  -
-    mailbox: Sent Items
diff --git a/.config/imapnotify/protonmail.yaml b/.config/imapnotify/protonmail.yaml
deleted file mode 100644
index a97739a2..00000000
--- a/.config/imapnotify/protonmail.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-host: 127.0.0.1
-port: 1143
-tls: false,
-tlsOptions:
-  rejectUnauthorized: false
-  starttls: true
-username: daniel@ficd.ca
-passwordCMD: 'pass show proton/bridge'
-xoAuth2: false
-onNewMail: '/home/fic/.config/aerc/mail-sync.sh'
-wait: 20
-boxes:
-  -
-    mailbox: INBOX
-  -
-    mailbox: Sent
diff --git a/.notmuch/hooks/post-new b/.notmuch/hooks/post-new
index e48482c5..8a01c593 100755
--- a/.notmuch/hooks/post-new
+++ b/.notmuch/hooks/post-new
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-notmuch tag +school -- "is:new path:school/**"
-notmuch tag +personal-- "is:new path:personal/**"
+notmuch tag +school -new -- "is:new path:school/**"
+notmuch tag +personal -new -- "is:new path:personal/**"