diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index ff171a2e..d9ce121b 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -1,19 +1,19 @@
 [Fastmail]
 # server stuff
-source = jmap+oauthbearer://@api.fastmail.com/jmap/session
-source-cred-cmd = pass show fastmail/aerc
-outgoing = jmap://
-default = Inbox
-folders-sort = Inbox
+source                      = jmap+oauthbearer://@api.fastmail.com/jmap/session
+source-cred-cmd             = pass show fastmail/aerc
+outgoing                    = jmap://
+default                     = Inbox
+folders-sort                = Inbox
 # JMAP stuff
-use-labels = true
-cache-state = false
-cache-blobs = true
+use-labels                  = true
+cache-state                 = false
+cache-blobs                 = true
 # Identity stuff
-from = Daniel Fichtinger <daniel@ficd.ca>
-signature-file       = /home/fic/mail/daniel@ficd.ca.sig
-aliases = Daniel Fichtinger <notdaf@ficcdaf.ca>, Daniel Fichtinger <*@ficd.ca>, Daniel Fichtinger <*@ficcdaf.ca>, Daniel Fichtinger <notdaniel@ficcdaf.ca>
-use-envelope-from = true
+from                        = Daniel Fichtinger <daniel@ficd.ca>
+signature-file              = /home/fic/mail/daniel@ficd.ca.sig
+aliases                     = Daniel Fichtinger <notdaf@ficcdaf.ca>, Daniel Fichtinger <*@ficd.ca>, Daniel Fichtinger <*@ficcdaf.ca>, Daniel Fichtinger <notdaniel@ficcdaf.ca>
+use-envelope-from           = true
 pgp-auto-sign               = true
 pgp-self-encrypt            = true
 pgp-attach-key              = false
@@ -21,18 +21,19 @@ pgp-opportunistic-encrypt   = false
 pgp-error-level             = warn
 pgp-key-id                  = 965699C862DA92143CDE2877D1B0947B25420214
 # Address Book
-carddav-source = https://daniel%40ficd.ca@carddav.fastmail.com/dav/addressbooks/user/daniel@ficd.ca/Default
-carddav-source-cred-cmd = pass show fastmail/carddav
-address-book-cmd = /home/fic/tools/carddav-query.py -S Fastmail %s
+carddav-source              = https://daniel%40ficd.ca@carddav.fastmail.com/dav/addressbooks/user/daniel@ficd.ca/Default
+carddav-source-cred-cmd     = pass show fastmail/carddav
+address-book-cmd            = /home/fic/tools/carddav-query.py -S Fastmail %s
 
 [Outlook]
-source               = imaps+xoauth2://18daf3%40queensu.ca@outlook.office365.com?token_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/token&client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753
-# source-cred-cmd      = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test
-source-cred-cmd =  gpg --decrypt --quiet /home/fic/tools/tokenfile-test | jq -r '.refresh_token'
-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
-signature-file       = /home/fic/mail/fichtinger.d@queensu.ca.sig
-address-book-cmd='ugrep -jP -m 100 --color=never "%s" /home/fic/mail/ranked-addrbook.tsv'
+source                      = imaps+xoauth2://18daf3%40queensu.ca@outlook.office365.com?token_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/token&client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753
+# source-cred-cmd           = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test
+source-cred-cmd             =  gpg --decrypt --quiet /home/fic/tools/tokenfile-test | jq -r '.refresh_token'
+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>
+aliases                     = Daniel Fichtinger <18daf3@queensu.ca>
+default                     = INBOX
+copy-to                     = Sent
+signature-file              = /home/fic/mail/fichtinger.d@queensu.ca.sig
+address-book-cmd            ='ugrep -jP -m 100 --color=never "%s" /home/fic/mail/ranked-addrbook.tsv'