diff --git a/mutt/DswanIOCOM.muttrc b/mutt/DswanIOCOM.muttrc
index f4552aa..56f946b 100644
--- a/mutt/DswanIOCOM.muttrc
+++ b/mutt/DswanIOCOM.muttrc
@@ -5,32 +5,27 @@
 #set mbox      = "+DswanIOCOM/archive"
 #set postponed = "+DswanIOCOM/drafts"
 
-#color status white blue
+color status white blue
 
-
-
-
-
-
-# New Stuff
-## Receive options.
-set imap_user=dswan@insors.com
-#set imap_pass=****
-set folder = imaps://dswan@secure.emailsrvr.com/
+# Receive options.
+set imap_user = "dswan@insors.com"
+set imap_pass = $my_iocom_password
+set folder = "imaps://secure.emailsrvr.com/"
 set spoolfile = +INBOX
 set postponed = +Drafts
 set record = +Sent
 
-## Send options.
-set smtp_url=smtps://dswan@secure.emailsrvr.com
-set realname='Dustin Swan'
-set from=dswan@iocom.com
-set hostname="iocom.com"
-set signature="Dustin Swan"
+# Send options.
+set smtp_url = "smtps://dswan@secure.emailsrvr.com"
+set smtp_pass = $my_iocom_password
+set realname = "Dustin Swan"
+set from = "dswan@iocom.com"
+set hostname = "iocom.com"
+
 # Connection options
 set ssl_force_tls = yes
 unset ssl_starttls
 
-## Hook -- IMPORTANT!
-#account-hook $folder "set imap_user=dswan@insors.com imap_pass=****"
-account-hook $folder "set imap_user=dswan@insors.com"
+# Hook
+account-hook $folder "set imap_user = dswan@insors.com"
+account-hook $folder "set imap_pass = $my_iocom_password"
diff --git a/mutt/DustinswanGmail.muttrc b/mutt/DustinswanGmail.muttrc
index be82e8a..19d2617 100644
--- a/mutt/DustinswanGmail.muttrc
+++ b/mutt/DustinswanGmail.muttrc
@@ -5,34 +5,29 @@
 #set mbox      = "+DustinswanGmail/archive"
 #set postponed = "+DustinswanGmail/drafts"
 
-#unset move
+color status white red
 
-#color status white red
-
-
-
-
-
-
-# New Stuff
-## Receive options.
-set imap_user=dustinswan@gmail.com
-#set imap_pass=****
-set folder = imaps://dustinswan@imap.gmail.com/
+# Receive options.
+set imap_user = "dustinswan@gmail.com"
+set imap_pass = $my_gmail_password
+set folder = "imaps://dustinswan@imap.gmail.com"
 set spoolfile = +INBOX
 set postponed = +Drafts
-set record = +Sent
+# set record = +Sent # Gmail saves this automatically
+
+set move = no
+
+# Send options.
+set smtp_url = "smtps://dustinswan@smtp.gmail.com"
+set smtp_pass = $my_gmail_password
+set realname = 'Dustin Swan'
+set from = "dustinswan@gmail.com"
+set hostname = "gmail.com"
 
-## Send options.
-set smtp_url=smtps://dustinswan@smtp.gmail.com
-set realname='Dustin Swan'
-set from=dustinswan@gmail.com
-set hostname="gmail.com"
-set signature="Dustin Swan"
 # Connection options
 set ssl_force_tls = yes
 unset ssl_starttls
 
-## Hook -- IMPORTANT!
-#account-hook $folder "set imap_user=dustinswan@gmail.com imap_pass=****"
-account-hook $folder "set imap_user=dustinswan@gmail.com"
+# Hook
+account-hook $folder "set imap_user = dustinswan@gmail.com"
+account-hook $folder "set imap_pass = $my_gmail_password"
diff --git a/mutt/muttrc b/mutt/muttrc
index 12361c0..6affc9d 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -10,12 +10,10 @@ set mailcap_path     = ~/.mailcap
 set tmpdir           = ~/.mutt/temp
 set signature        = ~/.mutt/sig
 
-set mbox_type = Maildir
+#set mbox_type = Maildir
 
-# Start with these
-set spoolfile = "+DustinswanGmail/INBOX"
-set mbox      = "+DustinswanGmail/archive"
-set postponed = "+DustinswanGmail/drafts"
+source "gpg -d ~/.gmail_password_mutt.gpg |"
+source "gpg -d ~/.iocom_password_mutt.gpg |"
 
 folder-hook DustinswanGmail 'source ~/.mutt/DustinswanGmail.muttrc'
 folder-hook DswanIOCOM 'source ~/.mutt/DswanIOCOM.muttrc'
@@ -50,7 +48,7 @@ set sort_aux = reverse-last-date-received
 # Sidebar
 set sidebar_delim   = '  │'
 set sidebar_visible = yes
-set sidebar_width   = 40
+set sidebar_width   = 41
 # color sidebar_new color221 color233
 bind index <down>     sidebar-next
 bind index <up>       sidebar-prev
@@ -67,9 +65,6 @@ bind index <right>    sidebar-open
 # Colors
 # source ~/.mutt/mutt-colors-solarized-dark-256.muttrc
 
-# Source offlineimap's mailbox list
-source ~/.mutt/mailboxes
-
 # Notmuch
 # 'L' performs a notmuch query, showing only the results
 #macro index L "<enter-command>unset wait_key<enter><shell-escape>read -p 'notmuch query: ' x; echo \$x >~/.cache/mutt_terms<enter><limit>~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;chomp@a;s/\^id:// for@a;$,=\"|\";print@a'\`\"<enter>" "show only messages matching a notmuch pattern"
@@ -87,21 +82,19 @@ macro pager \Cu "|urlview<enter>" "call urlview to open links"
 
 
 
-# New stuff
-## General options
+# General options
 set imap_check_subscribed
 set imap_keepalive = 300
 unset imap_passive
 set mail_check = 60
-set mbox_type=Maildir
-
-## Gmail
-source "~/.mutt/DustinswanGmail.muttrc"
-# Here we use the $folder variable that has just been set in the sourced file.
-# We must set it right now otherwise the 'folder' variable will change in the next sourced file.
-folder-hook $folder 'source ~/.mutt/DustinswanGmail.muttrc'
 
-## IOCOM
+# IOCOM
 source "~/.mutt/DswanIOCOM.muttrc"
-folder-hook *dswan@iocom.com/ 'source ~/.mutt/DswanIOCOM.muttrc'
+folder-hook 'imaps://dswan@secure.emailsrvr.com""' 'source ~/.mutt/DswanIOCOM.muttrc'
+
+# Gmail
+source "~/.mutt/DustinswanGmail.muttrc"
+folder-hook 'imaps://dustinswan@imap.gmail.com' 'source ~/.mutt/DustinswanGmail.muttrc'
 
+macro index <f2> '<change-folder>imaps://dustinswan@imap.gmail.com<enter>'
+macro index <f3> '<change-folder>imaps://dswan@secure.emailsrvr.com<enter>'