diff --git a/mutt/bindings.rc b/mutt/bindings.rc
index 20589b3..cbf18d3 100644
--- a/mutt/bindings.rc
+++ b/mutt/bindings.rc
@@ -1,3 +1,4 @@
+# Rules for handling the sidebar
 bind index,pager \Cp sidebar-prev
 # Move the highlight to the next mailbox
 bind index,pager \Cn sidebar-next
@@ -16,3 +17,7 @@ bind index,pager <F5> sidebar-prev-new
 bind index,pager <F6> sidebar-next-new
 # Toggle the visibility of the Sidebar.
 bind index,pager B sidebar-toggle-visible
+# make it so vi keys navigate the index, capital vi keys navigate the sidebar
+bind index K sidebar-prev          # got to previous folder in sidebar
+bind index J sidebar-next         # got to next folder in sidebar
+bind index <space> sidebar-open         # open selected folder from sidebar
diff --git a/mutt/colors.rc b/mutt/colors.rc
index 63a9748..81ae23f 100644
--- a/mutt/colors.rc
+++ b/mutt/colors.rc
@@ -1,4 +1,8 @@
+color body	brightblue black (https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+
 color header cyan black subject
+color header yellow black from
+color header yellow black cc
+color header color244 black to
 color hdrdefault brightwhite black
 color quoted brightgreen black
 color status black cyan
diff --git a/mutt/macros.rc b/mutt/macros.rc
index a8ca547..604387e 100644
--- a/mutt/macros.rc
+++ b/mutt/macros.rc
@@ -9,6 +9,7 @@ macro index t "<pipe-message>mutt2task<enter>"
 # '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"
 # 'a' shows all messages again (supersedes default <alias> binding)
+### Nutmuch stuff
 macro index a "<limit>all\n" "show all messages (undo limit)"
 macro index \\\\ "<vfolder-from-query>"              # looks up a hand made query
 macro index A "<modify-labels>+archive -unread -inbox\\n"        # tag as Archived
@@ -16,6 +17,4 @@ macro index I "<modify-labels>-inbox -unread\\n"                 # removed from
 macro index S "<modify-labels-then-hide>-inbox -unread +junk\\n" # tag as Junk mail
 macro index + "<modify-labels>+*\\n<sync-mailbox>"               # tag as starred
 macro index - "<modify-labels>-*\\n<sync-mailbox>"               # tag as unstarred
-bind index <left> sidebar-prev          # got to previous folder in sidebar
-bind index <right> sidebar-next         # got to next folder in sidebar
-bind index <space> sidebar-open         # open selected folder from sidebar
+#### end notmuch stuff
diff --git a/mutt/muttrc b/mutt/muttrc
index f538b0b..11d7cab 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -1,4 +1,3 @@
-### save and sync my sent messages
 #set record=~/Maildir/arachnitech/Sent
 set sidebar_visible = yes
 ## set record="~/Maildir/Sent Mail"
@@ -16,15 +15,16 @@ alternative_order text/plain text/enriched text/html
 auto_view text/html
 auto_view text/calendar
 
-
+# Just do what I tell you to, consequences be damned
+set confirmappend=yes
+set delete=yes
+# Show new notification when mail arrives
 set new_mail_command="notify-send --icon='/home/kellya/images/mutt-1.png' \
    'New Emails' '%n new messages' &"
 
-#source ~/.mutt/bindings
-#source ~/.mutt/mailboxes
-#source ~/.mutt/gpg
-#source ~/.mutt/macros
-#source ~/.mutt/notmuch
+# Run a script to cat anything that has .rc as the extension to auto source things
 source ~/.mutt/sources.sh|
+
+# Addressbook lookup
 set query_command="khard email -p '%s'"
 bind editor <Tab> complete-query