diff --git a/bin/check_mail.sh b/bin/check_mail.sh
deleted file mode 100755
index 9ab616e..0000000
--- a/bin/check_mail.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-~/dotfiles/bin/notmuch_osx_menubar_count.rb &
-while true; do
-    afew -m; offlineimap; notmuch new
-    sleep 45
-done
diff --git a/brew_list b/brew_list
index e69a6fd..e67918a 100644
--- a/brew_list
+++ b/brew_list
@@ -48,10 +48,9 @@ nvm
 offline-imap
 openssl
 perforce
-pinentry
+pinentry-mac
 postgresql
 python3
-ranger
 readline
 reattach-to-user-namespace
 rlog
@@ -68,7 +67,6 @@ tree
 urlview
 w3m
 watch
-weechat
 wget
 zsh
-emacs --cocoa --with-mailutils --with-imagemagick
\ No newline at end of file
+emacs --cocoa --with-glib --with-imagemagick --with-librsvg --with-mailutils
\ No newline at end of file
diff --git a/khal.conf b/khal.conf
index 8d82b94..a3605bf 100644
--- a/khal.conf
+++ b/khal.conf
@@ -160,28 +160,7 @@
 # 
 
 
-[Account google]
-user: dustinswan@gmail.com
-resource: https://www.google.com/calendar/dav/dustinswan@gmail.com/user/
-ssl_verify: /usr/local/etc/openssl/cert.pem
-ssl_verify: True
-readonly: True
-#server_type: http
-#color: dark blue
-
-[sqlite]
-path: ~/.khal/khal.db
-
-[default]
-default_timezone: America/Chicago
-local_timezone: America/Chicago
-
-timeformat: %H:%M
-dateformat: %d.%m.
-longdateformat: %d.%m.%Y
-datetimeformat: %d.%m. %H:%M
-longdatetimeformat: %d.%m.%Y %H:%M
-
-firstweekday: 0
-
-debug: 1
+[calendars]
+    [[Google]]
+    path = ~/calendars/google
+    color = blue
diff --git a/mbsyncrc b/mbsyncrc
deleted file mode 100644
index f07b3c2..0000000
--- a/mbsyncrc
+++ /dev/null
@@ -1,54 +0,0 @@
-IMAPAccount gmail
-Host imap.gmail.com
-User dustinswan@gmail.com
-PassCmd "gpg -d ~/.gmail-password.gpg"
-UseIMAPS yes
-#CertificateFile ~/.mail/gmail.pem
-
-IMAPStore gmail-remote
-Account gmail
-#Path [Gmail]/
-
-MaildirStore gmail-local
-Path ~/.mail/gmail/
-Inbox ~/.mail/gmail/INBOX
-Flatten .
-
-Channel gmail
-Master :gmail-remote:
-Slave :gmail-local:
-# Include everything
-Patterns *
-# Automatically create missing mailboxes, both locally and on the server
-Create Both
-# Expunge Both
-# Save the synchronization state files in the relevant directory
-SyncState *
-
-
-
-IMAPAccount iocom
-Host secure.emailsrvr.com
-User dswan@insors.com
-PassCmd "gpg -d ~/.iocom-password.gpg"
-UseIMAPS yes
-
-IMAPStore iocom-remote
-Account iocom
-Path INBOX
-
-MaildirStore iocom-local
-Path ~/.mail/iocom/
-Inbox ~/.mail/iocom/INBOX
-Flatten .
-
-Channel iocom
-Master :iocom-remote:
-Slave :iocom-local:
-# Include everything
-Patterns *
-# Automatically create missing mailboxes, both locally and on the server
-Create Both
-# Expunge Both
-# Save the synchronization state files in the relevant directory
-SyncState *
diff --git a/msmtprc b/msmtprc
index ed2a906..639ff6f 100644
--- a/msmtprc
+++ b/msmtprc
@@ -1,6 +1,6 @@
 defaults
 protocol smtp
-logfile ~/.msmtp.log
+logfile "~/.msmtp.log"
 
 account DustinswanGmail
 host smtp.gmail.com
@@ -8,12 +8,10 @@ port 587
 protocol smtp
 from dustinswan@gmail.com
 user dustinswan@gmail.com
-passwordeval gpg --no-tty -d ~/.gmail-password.gpg
+passwordeval "gpg --no-tty -q -d ~/.gmail-password.gpg"
 auth on
 tls on
-tls_trust_file /usr/local/etc/openssl/cert.pem
-
-
+tls_trust_file "/usr/local/etc/openssl/cert.pem"
 
 account DswanIOCOM
 host secure.emailsrvr.com
@@ -23,9 +21,8 @@ port 587
 from dswan@iocom.com
 tls on
 tls_starttls on
-tls_trust_file /usr/local/etc/openssl/cert.pem
+tls_trust_file "/usr/local/etc/openssl/cert.pem"
 user dswan@insors.com
-passwordeval gpg -d ~/.iocom-password.gpg
-
+passwordeval "gpg --no-tty -q -d ~/.iocom-password.gpg"
 
 account default : DustinswanGmail
diff --git a/vdirsyncer/config b/vdirsyncer/config
index 3a59a2e..e7dd691 100644
--- a/vdirsyncer/config
+++ b/vdirsyncer/config
@@ -5,13 +5,6 @@
 # A folder where vdirsyncer can store some metadata about each pair.
 status_path = ~/.vdirsyncer/status/
 
-# The amount of processes to use when synchronizing. If the CPU of your server
-# is the bottleneck (which is plausible for small homeservers), set this to the
-# number of cores * 2. Defaults to one process for each collection, which means
-# all collections will be synced at once. The value 0 will be ignored, the
-# value 1 disables multiprocessing.
-processes = 2
-
 # CONTACTS
 #[pair google_contacts]
 ## A `[pair <name>]` block defines two storages `a` and `b` that should be
@@ -70,7 +63,7 @@ b = google_calendar_remote
 
 [storage google_calendar_local]
 type = filesystem
-path = ~/.calendar
+path = ~/Calendars/
 fileext = .ics
 
 [storage google_calendar_remote]