diff --git a/muttrc b/muttrc
new file mode 100644
index 0000000..1c590ff
--- /dev/null
+++ b/muttrc
@@ -0,0 +1,23 @@
+set mbox_type=Maildir
+set folder=$HOME/Mail/FastMail
+set spoolfile=+/INBOX
+set header_cache=~/.cache/mutt
+
+set realname='Dustin Swan'
+set sendmail="/usr/local/bin/msmtp"
+
+set edit_headers=yes
+set folder=~/Mail
+set mbox=+mbox
+set spoolfile=+inbox
+set record=+sent
+set postponed=+drafts
+set mbox_type=Maildir
+
+mailboxes +inbox
+
+source "~/.mutt/iocom"
+folder-hook $folder 'source ~/.mutt/iocom'
+
+source "~/.mutt/fastmail"
+folder-hook *user@fastmail.com/ 'source ~/.mutt/fastmail'
diff --git a/tmux.conf b/tmux.conf
index 32fe52f..92000d6 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -16,9 +16,6 @@ set -g set-titles-string "#H (#S)"
 # Status
 set -g status on
 
-# Powerline
-source "$HOME/.pyenv/versions/2.7.9/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf"
-
 # Escape delay
 set -s escape-time 1
 
@@ -37,6 +34,13 @@ set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'tmux-plugins/tmux-open'
 set -g @plugin 'tmux-plugins/tmux-pain-control'
 set -g @plugin 'jbnicolai/tmux-urlview'
+set -g @plugin 'tmux-plugins/tmux-battery'
+set -g @plugin 'tmux-plugins/tmux-maildir-counter'
+set -g @plugin 'seebi/tmux-colors-solarized'
+
+set -g @maildir_counters '~/Mail/FastMail/INBOX/new|~/Mail/IOCOM/INBOX/new'
+
+set -g status-right '✉ F:#{maildir_counter_1} I:#{maildir_counter_2} | #{battery_icon} #{battery_percentage} | %a %h-%d %H:%M '
 
 # Initialize TMUX plugin manager
 run '~/.tmux/plugins/tpm/tpm'