diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index 3318e524..276b11b6 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -831,6 +831,7 @@ aerc-startup=/home/fic/.config/mail/mail-sync.sh &
 #
 # Executed when aerc shuts down.
 #aerc-shutdown=
+aerc-shutdown=/home/fic/.config/mail/mail-sync.sh &
 
 #
 # Executed when notmuch tags are modified.
diff --git a/.config/aerc/personal-map.conf b/.config/aerc/personal-map.conf
index e9133e27..4c0f7b63 100644
--- a/.config/aerc/personal-map.conf
+++ b/.config/aerc/personal-map.conf
@@ -1,4 +1,5 @@
-InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:personal and not tag:sent
+InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:personal and not tag:sent and not tag:git and not tag:srht
 SentNM=tag:sent and tag:personal
 to-me=tag:to-me
 sr.ht=tag:inbox and tag:srht
+git=tag:inbox and tag:git
diff --git a/.config/aerc/school-map.conf b/.config/aerc/school-map.conf
index ad179ede..d7396620 100644
--- a/.config/aerc/school-map.conf
+++ b/.config/aerc/school-map.conf
@@ -1,2 +1,5 @@
-InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:school and not tag:sent
+InboxNM=tag:inbox and not tag:archived and not tag:deleted and tag:school and not tag:sent and not tag:git and not tag:srht
 SentNM=tag:sent and tag:school
+to-me=tag:to-me
+# sr.ht=tag:inbox and tag:srht
+# git=tag:inbox and tag:git
diff --git a/.mbsyncrc b/.mbsyncrc
index e0cbd17b..75556af7 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -57,10 +57,10 @@ Create Both
 Expunge Both
 SyncState *
 
-Group protonmail
+Group personal
 Channel pm-inbox
 Channel pm-sent
 
-Group outlook
+Group school
 Channel outlook-inbox
 Channel outlook-sent