diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index 6dbe3c9..85a1ce2 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -1,75 +1,6 @@
-IMAPAccount jeremy-dormitzer-net
-Host mail.dormitzer.net
-user jeremy@dormitzer.net
-PassCmd "pass show jeremy@dormitzer.net | head -n 1"
-PipelineDepth 50
-
-IMAPStore jeremy-dormitzer-net-remote
-Account jeremy-dormitzer-net
-
-MaildirStore jeremy-dormitzer-net-local
-Path ~/.mail/jeremy-dormitzer-net/
-Inbox ~/.mail/jeremy-dormitzer-net/Inbox
-SubFolders Verbatim
-
-Channel jeremy-dormitzer-net
-Master :jeremy-dormitzer-net-remote:
-Slave :jeremy-dormitzer-net-local:
-Patterns *
-Create Both
-SyncState *
-
-IMAPAccount jeremy-getpterotype-com
-Host imap.gmail.com
-user jeremy@getpterotype.com
-PassCmd "pass show jeremy@getpterotype.com | head -n 1"
-SSLType IMAPS
-CertificateFile ~/cert.pem
-AuthMechs LOGIN
-PipelineDepth 50
-
-IMAPStore jeremy-getpterotype-com-remote
-Account jeremy-getpterotype-com
-
-MaildirStore jeremy-getpterotype-com-local
-Path ~/.mail/jeremy-getpterotype-com/
-Inbox ~/.mail/jeremy-getpterotype-com/Inbox
-SubFolders Verbatim
-
-Channel jeremy-getpterotype-com-inbox
-Master :jeremy-getpterotype-com-remote:
-Slave :jeremy-getpterotype-com-local:
-Patterns "INBOX"
-Create Both
-SyncState *
-
-Channel jeremy-getpterotype-com-trash
-Master :jeremy-getpterotype-com-remote:"[Gmail]/Trash"
-Slave :jeremy-getpterotype-com-local:"Trash"
-Create Both
-SyncState *
-
-Channel jeremy-getpterotype-com-sent
-Master :jeremy-getpterotype-com-remote:"[Gmail]/Sent Mail"
-Slave :jeremy-getpterotype-com-local:"Sent"
-Create Both
-SyncState *
-
-Channel jeremy-getpterotype-com-all
-Master :jeremy-getpterotype-com-remote:"[Gmail]/All Mail"
-Slave :jeremy-getpterotype-com-local:"Archive"
-Create Both
-SyncState *
-
-Group jeremy-getpterotype-com
-Channel jeremy-getpterotype-com-inbox
-Channel jeremy-getpterotype-com-trash
-Channel jeremy-getpterotype-com-sent
-Channel jeremy-getpterotype-com-all
-
 IMAPAccount jeremy-dormitzer-gmail-com
 Host imap.gmail.com
-user jeremy.dormitzer@gmail.com
+User jeremy.dormitzer@gmail.com
 PassCmd "pass show imap.gmail.com | head -n 1"
 SSLType IMAPS
 CertificateFile ~/cert.pem
@@ -84,10 +15,10 @@ Path ~/.mail/jeremy-dormitzer-gmail-com/
 Inbox ~/.mail/jeremy-dormitzer-gmail-com/Inbox
 SubFolders Verbatim
 
-Channel jeremy-dormitzer-gmail-com-inbox
+Channel jeremy-dormitzer-gmail-com
 Master :jeremy-dormitzer-gmail-com-remote:
 Slave :jeremy-dormitzer-gmail-com-local:
-Patterns "INBOX"
+Patterns * ![Gmail]*
 Create Both
 SyncState *
 
@@ -110,14 +41,14 @@ Create Both
 SyncState *
 
 Group jeremy-dormitzer-gmail-com
-Channel jeremy-dormitzer-gmail-com-inbox
 Channel jeremy-dormitzer-gmail-com-trash
+Channel jeremy-dormitzer-gmail-com
 Channel jeremy-dormitzer-gmail-com-sent
 Channel jeremy-dormitzer-gmail-com-all
 
 IMAPAccount jeremydormitzer-lola-com
 Host imap.gmail.com
-user jeremydormitzer@lola.com
+User jeremydormitzer@lola.com
 PassCmd "pass show lola-gmail | head -n 1"
 SSLType IMAPS
 CertificateFile ~/cert.pem
@@ -132,10 +63,10 @@ Path ~/.mail/jeremydormitzer-lola-com/
 Inbox ~/.mail/jeremydormitzer-lola-com/Inbox
 SubFolders Verbatim
 
-Channel jeremydormitzer-lola-com-inbox
+Channel jeremydormitzer-lola-com
 Master :jeremydormitzer-lola-com-remote:
 Slave :jeremydormitzer-lola-com-local:
-Patterns "INBOX"
+Patterns * ![Gmail]*
 Create Both
 SyncState *
 
@@ -158,7 +89,7 @@ Create Both
 SyncState *
 
 Group jeremydormitzer-lola-com
-Channel jeremydormitzer-lola-com-inbox
 Channel jeremydormitzer-lola-com-trash
+Channel jeremydormitzer-lola-com
 Channel jeremydormitzer-lola-com-sent
 Channel jeremydormitzer-lola-com-all