diff --git a/emacs.d/org-mode b/emacs.d/org-mode
deleted file mode 160000
index 099b6f0..0000000
--- a/emacs.d/org-mode
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 099b6f0fb5b4db43bc9025a71c136f773c8289cb
diff --git a/emacs.d/solarized b/emacs.d/solarized
deleted file mode 160000
index 6a2c7ca..0000000
--- a/emacs.d/solarized
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6a2c7ca0181585858e6e8054cb99db837e2ef72f
diff --git a/muttrc b/muttrc
index ca6c18c..e5c363c 100644
--- a/muttrc
+++ b/muttrc
@@ -29,7 +29,7 @@ set envelope_from=yes
 # Interface
 set quit=ask-yes
 set move=no
-unset mark_old
+set mark_old=no
 set charset=UTF8
 set sort=threads
 set sort_aux=last-date-received
@@ -37,7 +37,10 @@ set sort_browser=alpha
 set tilde=yes
 set markers=no
 set smart_wrap
-unset beep
+
+# Sounds
+set beep=no
+set beep_new=yes
 
 ignore *
 unignore Date: From: To: Cc: Subject:
@@ -58,8 +61,21 @@ alternative_order text/plain text/enriched text/html
 
 unmailboxes "$record" "$postponed" "$trash"
 
+# Basically the default, but give a little more space to addresses since we are no longer in the 80s.
 set index_format="%4C %Z %{%b %d} %-20.20L (%?l?%4l&%4c?) %s"
 
+# Vim style first and last
+bind index gg       first-entry
+bind index G        last-entry
+
+bind index R        group-reply
+bind index <tab>    sync-mailbox
+bind index <space>  collapse-thread
+
+# First syncs everything, second syncs only INBOX.
+macro index O "<shell-escape>offlineimap<enter>"
+macro index o "<shell-escape>offlineimap -qf INBOX<enter>"
+
 # Some resources for colors:
 # http://www.strcat.de/dotfiles/mutt.color
 # https://github.com/altercation/mutt-colors-solarized/blob/master/mutt-colors-solarized-dark-256.muttrc
@@ -70,7 +86,7 @@ color index default     default     ~A
 # Unread email
 color index color33     default     ~U
 # Email to me
-color index color64     default     ~p
+#color index color64     default     ~p
 # Collapsed thread
 color index color61     default     ~v
 # Deleted email