diff --git a/install.sh b/install.sh
index abfb410..e92148c 100755
--- a/install.sh
+++ b/install.sh
@@ -1,16 +1,13 @@
 #!/bin/bash
 
 dir=~/dotfiles
-files="vimrc tmux.conf zshrc conkyrc"
+files="vimrc tmux.conf bashrc"
 
 cd $dir
 for file in $files; do
 	ln -s $dir/$file ~/.$file
 done
 
-chmod +x dwmstart
-ln -s $dir/dwmstart ~/dwmstart
-
 if [ ! -d ~/.vim/bundle/vundle ]; then
 	git clone https://github.com/gmarik/vundle.git  ~/.vim/bundle/vundle
 	vim +BundleInstall +qall
diff --git a/muttrc b/muttrc
new file mode 100644
index 0000000..ef45b59
--- /dev/null
+++ b/muttrc
@@ -0,0 +1,35 @@
+set realname = "Brandon Cornejo"
+set from = "brandon.cornejo@corvisa.com"
+set envelope_from = yes
+
+set imap_user="brandon.cornejo"
+set folder = imaps://mail.corvisa.com/
+
+set spoolfile = "=INBOX"
+set record = "=Sent Items"
+set postponed = "=Drafts"
+set copy=yes
+
+source ~/.mutt/mutt-colors-solarized-dark-16.muttrc
+#source ~/.mutt/arch-color-scheme.muttrc
+
+set sort = threads
+
+bind pager "G" bottom
+bind index "^" imap-fetch-mail
+
+set header_cache = ~/.mutt/headercache
+set message_cachedir = ~/.mutt/messagecache
+
+set mail_check=60
+set timeout=10
+set sleep_time=0
+set pager_index_lines=10
+
+set signature="fortune |"
+
+set date_format="%y-%m-%d %T"
+set index_format="%2C | %Z [%d] %-30.30F (%-4.4c) %s"
+
+auto_view text/html
+alternative_order text/plain text/enriched text/html
diff --git a/vimrc b/vimrc
index 9e0799c..4ef61a1 100644
--- a/vimrc
+++ b/vimrc
@@ -12,7 +12,7 @@ if has("autocmd")
     filetype indent on
     filetype plugin on
     set ofu=syntaxcomplete#Complete
-    autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == \"primary") | q | endif
+    "autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == \"primary") | q | endif
 endif
 
 " basic options
@@ -94,6 +94,9 @@ imap ,/ </<C-X><C-O>
 :nmap <leader>w :setlocal wrap!<CR>:setlocal wrap?<CR>
 
 " dem fancy colors
-" set t_Co=256
+set t_Co=256
 "colorscheme ir_black  " for macvim
 colorscheme distinguished
+
+" force django templates to use html syntax
+au BufNewFile,BufRead *.djhtml set filetype=html