diff --git a/muttrc b/muttrc
index fc9d4de..d13617b 100644
--- a/muttrc
+++ b/muttrc
@@ -1,21 +1,32 @@
 source "gpg -dq ~/.my-pwds.gpg |"
 
-set imap_user = dustinswan@gmail.com
-
+set realname = "Dustin Swan"
+set imap_user = "dustinswan@gmail.com"
 set imap_pass = $my_pw_personal
-
-set folder = imaps://imap.gmail.com/
-
+set folder = "imaps://imap.gmail.com/"
 set spoolfile = +INBOX
-
 set imap_check_subscribed
+#set header_cache  = ~/.mutt/hcache
+set record = "+[Gmail]/Sent Mail"
+set postponed = "+[Gmail]/Drafts"
+unset imap_passive
+set imap_keepalive = 300
+set mail_check = 120
 
-set header_cache  = ~/.mutt/hcache
-
-set postponed = +[Gmail]/Drafts
+# Sorting
+set sort = threads
+set sort_aux = reverse-last-date-received
 
-unset imap_passive
+# Sidebar
+set sidebar_delim   = '  │'
+set sidebar_visible = yes
+set sidebar_width   = 24
+#color sidebar_new color221 color233
 
-set imap_keepalive = 300
+bind index <down>     sidebar-next
+bind index <up>       sidebar-prev
+bind index <right>    sidebar-open
 
-set mail_check = 120
+# Status Bar
+#set status_chars = "  *&A"
+#set status_format = "---[ Folder: %f ]---[%r%n messages%?n? (%n new)?%?d? (%d to delete)?%?t? (%t tagged)? ]---%>-%?p?( %p postponed )?---""
diff --git a/oh-my-zsh b/oh-my-zsh
index 73f7770..c2ae9e0 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 73f777053725ce61d6fada67ff3f174130dd8c94
+Subproject commit c2ae9e09ca1f33ff1e13e629a0b2e6bdd19f83a9