diff --git a/git/.gitignore_global b/git/.gitignore_global
index 76d999a..bdc4b0c 100644
--- a/git/.gitignore_global
+++ b/git/.gitignore_global
@@ -31,3 +31,4 @@ local-config.diff
 .tern-port
 .mypy_cache
 org-gcal
+.tool-versions
diff --git a/mail/.mbsyncrc b/mail/.mbsyncrc
index 5fa479e..d454072 100644
--- a/mail/.mbsyncrc
+++ b/mail/.mbsyncrc
@@ -1,61 +1,107 @@
-IMAPAccount proton
-Host 127.0.0.1
+IMAPAccount onec
+Host box.onec.me
 User colin@onec.me
-PassCmd "pass personal/protonmail/bridges/$HOSTNAME"
-Port 1143
-SSLType none
-AuthMechs PLAIN
+PassCmd "pass personal/colin@onec.me"
+SSLType IMAPS
+Port 993
 
-IMAPStore proton-remote
-account proton
+IMAPStore onec-remote
+account onec
 
-MaildirStore proton-local
+MaildirStore onec-local
 # trailing "/" is important
 Path ~/Mail/colin@onec.me/
 Inbox ~/Mail/colin@onec.me/Inbox
 Trash ~/Mail/colin@onec.me/Trash
 SubFolders Verbatim
 
-Channel proton-all-mail
-Master :proton-remote:"All Mail"
-Slave :proton-local:"All Mail"
-Create Both
-Patterns *
-SyncState *
-
-Channel proton-inbox
-Master :proton-remote:"Inbox"
-Slave :proton-local:Inbox
+Channel onec-inbox
+Master :onec-remote:"Inbox"
+Slave :onec-local:Inbox
 Create Both
 Expunge Both
 Patterns *
 SyncState *
 
-Channel proton-archive
-Master :proton-remote:"Archive"
-Slave :proton-local:Archive
+Channel onec-archive
+Master :onec-remote:"Archive"
+Slave :onec-local:Archive
 Create Both
 Expunge Both
 SyncState *
 
-Channel proton-sent
-Master :proton-remote:"Sent"
-Slave :proton-local:Sent
+Channel onec-sent
+Master :onec-remote:"Sent"
+Slave :onec-local:Sent
 Create Both
 Expunge Both
 SyncState *
 
-Channel proton-trash
-Master :proton-remote:"Trash"
-Slave :proton-local:Trash
+Channel onec-trash
+Master :onec-remote:"Trash"
+Slave :onec-local:Trash
 Create Both
 Expunge Both
 SyncState *
 Expunge Both
 
-Group proton
-Channel proton-inbox
-Channel proton-archive
-Channel proton-sent
-Channel proton-drafts
-Channel proton-trash
+Group onec
+Channel onec-inbox
+Channel onec-archive
+Channel onec-sent
+Channel onec-drafts
+Channel onec-trash
+
+IMAPAccount timberwyck
+Host box.onec.me
+User colin@timberwyckfarm.com
+PassCmd "pass personal/colin@onec.me"
+SSLType IMAPS
+Port 993
+
+IMAPStore timberwyck-remote
+account timberwyck
+
+MaildirStore timberwyck-local
+# trailing "/" is important
+Path ~/Mail/colin@timberwyckfarm.com/
+Inbox ~/Mail/colin@timberwyckfarm.com/Inbox
+Trash ~/Mail/colin@timberwyckfarm.com/Trash
+SubFolders Verbatim
+
+Channel timberwyck-inbox
+Master :timberwyck-remote:"Inbox"
+Slave :timberwyck-local:Inbox
+Create Both
+Expunge Both
+Patterns *
+SyncState *
+
+Channel timberwyck-archive
+Master :timberwyck-remote:"Archive"
+Slave :timberwyck-local:Archive
+Create Both
+Expunge Both
+SyncState *
+
+Channel timberwyck-sent
+Master :timberwyck-remote:"Sent"
+Slave :timberwyck-local:Sent
+Create Both
+Expunge Both
+SyncState *
+
+Channel timberwyck-trash
+Master :timberwyck-remote:"Trash"
+Slave :timberwyck-local:Trash
+Create Both
+Expunge Both
+SyncState *
+Expunge Both
+
+Group timberwyck
+Channel timberwyck-inbox
+Channel timberwyck-archive
+Channel timberwyck-sent
+Channel timberwyck-drafts
+Channel timberwyck-trash
diff --git a/mail/.msmtprc b/mail/.msmtprc
index 5f37915..83bc0b8 100644
--- a/mail/.msmtprc
+++ b/mail/.msmtprc
@@ -1,12 +1,14 @@
 defaults
-auth           on
-tls            on
-tls_certcheck  off
-logfile        ~/.msmtp.log
+auth            on
+tls             on
+tls_fingerprint 72:9B:26:BC:91:8E:9A:9D:67:BA:79:4C:3B:B5:49:33:2E:DA:68:51
+logfile         ~/.msmtp.log
 
-account        proton
-host           127.0.0.1
-port           1025
+account        onec
+host           box.onec.me
+port           587
 from           colin@onec.me
 user           colin@onec.me
-passwordeval   pass personal/protonmail/bridges/$HOSTNAME
+passwordeval   pass personal/colin@onec.me
+
+account default : onec
diff --git a/mail/.notmuch-config b/mail/.notmuch-config.example
similarity index 100%
rename from mail/.notmuch-config
rename to mail/.notmuch-config.example