diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index bc0eb53f..3feb5d58 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -1,18 +1,20 @@
 [Personal]
-source        = imap://daniel%40ficd.ca@127.0.0.1:1143
-source-cred-cmd = pass show proton/bridge
-outgoing      = smtp://daniel%40ficd.ca@127.0.0.1:1025
+source            = imap://daniel%40ficd.ca@127.0.0.1:1143
+source-cred-cmd   = pass show proton/bridge
+outgoing          = smtp://daniel%40ficd.ca@127.0.0.1:1025
 outgoing-cred-cmd = pass show proton/bridge
-default       = INBOX
-from          = Daniel Fichtinger <daniel@ficd.ca>
-copy-to       = Sent
-cache-headers = true
+default           = INBOX
+from              = Daniel Fichtinger <daniel@ficd.ca>
+copy-to           = Sent
+cache-headers     = true
+signature-file    = /home/fic/mail/daniel@ficd.ca.sig
 
 [School]
 source            = imaps+xoauth2://18daf3%40queensu.ca@outlook.office365.com
-source-cred-cmd = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test
+source-cred-cmd   = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test
 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
-copy-to = Sent
+from              = Daniel Fichtinger <fichtinger.d@queensu.ca>
+default           = INBOX
+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 f08f9530..9cf85cb0 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -673,7 +673,7 @@ always-show-mime=true
 # ignored.
 #
 # This parameter can also be set per account in accounts.conf.
-address-book-cmd=emailbook /home/fic/notes/emailbook.txt --search "%s"
+address-book-cmd=emailbook /home/fic/mail/emailbook.txt --search "%s"
 
 # Specifies the command to be used to select attachments. Any occurrence of
 # '%s' in the file-picker-cmd will be replaced with the argument <arg>
diff --git a/.config/aerc/binds.conf b/.config/aerc/binds.conf
index 143c5c75..e6b564bd 100644
--- a/.config/aerc/binds.conf
+++ b/.config/aerc/binds.conf
@@ -106,8 +106,8 @@ S = :save<space>
 | = :pipe<space>
 D = :delete<Enter>
 A = :archive flat<Enter>
-aa = :pipe -m emailbook ~/notes/emailbook.txt --parse --all<Enter>
-af = :pipe -m emailbook ~/notes/emailbook.txt --parse --from<Enter>
+aa = :pipe -m emailbook ~/mail/emailbook.txt --parse --all<Enter>
+af = :pipe -m emailbook ~/mail/emailbook.txt --parse --from<Enter>
 
 <C-l> = :open-link <space>