diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index 3c5b46f8..d80e6b36 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -15,7 +15,7 @@ check-mail                  = 0
 exclude-tags                = spam,deleted
 postpone                    = drafts
 folders                     = inbox, auto, sent, to-me, sr.ht, git, archive, promo, recipts
-folders-sort                = inbox, sent, to-me, git, sr.ht, archive, recipts
+folders-sort                = inbox, auto, sent, to-me, sr.ht, git, archive, promo, recipts
 archive                     = archive
 pgp-auto-sign               = true
 pgp-self-encrypt            = true
@@ -40,8 +40,8 @@ signature-file              = /home/fic/mail/fichtinger.d@queensu.ca.sig
 # check-mail-cmd              = /home/fic/.config/mail/mail-sync.sh
 check-mail                  = 0
 exclude-tags                = spam,deleted
-folders                     = inbox, sent, to-me, archive
-folders-sort                = inbox, sent, to-me, archive
+folders                     = inbox, auto, sent, to-me, archive
+folders-sort                = inbox, auto, sent, to-me, archive
 
 # [Personal-IMAP]
 # source               = imap://daniel%40ficd.ca@127.0.0.1:1143
diff --git a/.config/aerc/school-map.conf b/.config/aerc/school-map.conf
index b2c4318c..5de67159 100644
--- a/.config/aerc/school-map.conf
+++ b/.config/aerc/school-map.conf
@@ -1,4 +1,5 @@
-inbox=tag:inbox and not tag:archive and not tag:deleted and tag:school and not tag:git and not tag:srht and not (from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca)
+inbox=tag:inbox and not tag:archive and not tag:deleted and tag:school and not tag:git and not tag:srht and not (from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca) and not tag:auto
+auto=tag:auto and not tag:archive and not tag:deleted and not tag:git and not tag:srht and not (from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca) and tag:school
 sent=tag:sent and tag:school and (from:fichtinger.d@queensu.ca or from:18daf3@queensu.ca)
 to-me=tag:to-me and tag:school
 archive=tag:archive and tag:school
diff --git a/.config/helix/languages.toml b/.config/helix/languages.toml
index 3067098c..8f45c2b7 100644
--- a/.config/helix/languages.toml
+++ b/.config/helix/languages.toml
@@ -138,6 +138,7 @@ file-types = [
   "swap",
   "target",
   "timer",
+  "desktop",
   # Podman quadlets
   "container",
   "volume",