diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index 311f68b8..47ec8935 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -19,9 +19,10 @@ default           = INBOX
 copy-to           = Sent
 signature-file    = /home/fic/mail/fichtinger.d@queensu.ca.sig
 
-[Proton-Local]
+[Personal-Local]
 source = notmuch://~/.mail/
-query-map = ~/.config/aerc/map.conf
+maildir-store = ~/.mail/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
diff --git a/.config/aerc/map.conf b/.config/aerc/personal-map.conf
similarity index 100%
rename from .config/aerc/map.conf
rename to .config/aerc/personal-map.conf
diff --git a/.config/aerc/school-map.conf b/.config/aerc/school-map.conf
new file mode 100644
index 00000000..4ccaa5c0
--- /dev/null
+++ b/.config/aerc/school-map.conf
@@ -0,0 +1 @@
+Inbox=tag:inbox and not tag:archived and not tag:deleted
diff --git a/.config/imapnotify/.helix/languages.toml b/.config/imapnotify/.helix/languages.toml
new file mode 100644
index 00000000..4b1155c7
--- /dev/null
+++ b/.config/imapnotify/.helix/languages.toml
@@ -0,0 +1,5 @@
+[[language]]
+name = "json"
+file-types = [
+"conf"
+]
diff --git a/.config/imapnotify/outlook.yaml b/.config/imapnotify/outlook.yaml
new file mode 100644
index 00000000..ce1e35ee
--- /dev/null
+++ b/.config/imapnotify/outlook.yaml
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 00000000..a97739a2
--- /dev/null
+++ b/.config/imapnotify/protonmail.yaml
@@ -0,0 +1,16 @@
+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/.config/yadm/tracked b/.config/yadm/tracked
index ea4e7dfc..38b20364 100644
--- a/.config/yadm/tracked
+++ b/.config/yadm/tracked
@@ -48,3 +48,5 @@
 .config/aerc
 .mbsyncrc
 .notmuch-config
+.notmuch
+.config/imapnotify
diff --git a/.notmuch/hooks/post-new b/.notmuch/hooks/post-new
new file mode 100755
index 00000000..e48482c5
--- /dev/null
+++ b/.notmuch/hooks/post-new
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+notmuch tag +school -- "is:new path:school/**"
+notmuch tag +personal-- "is:new path:personal/**"