diff --git a/vimrc.after b/vimrc.after
index e35b406..7d24eea 100644
--- a/vimrc.after
+++ b/vimrc.after
@@ -4,21 +4,24 @@ set tabstop=4
 set shiftwidth=4
 set softtabstop=4
 
+map ,t :w<CR>
+map ,m :w\|:make<CR><CR>
+map ,- :nohl<CR>
+
 " Set the indent to 2 when working with ruby and markup stuff
-autocmd BufNewFile,BufRead *.feature,*.rb,*.ru,*.xml,*.html,*.htm,Gemfile,Rakefile,Procfile set shiftwidth=2
+autocmd BufNew,BufRead *.feature,*.rb,*.ru,*.xml,*.html,*.htm,Gemfile,Rakefile,Procfile set shiftwidth=2
     \| set tabstop=2
     \| set softtabstop=2
 
 " Set up some sane java compilation bits
-autocmd BufNewFile,BufRead *.java set efm=%A\ %#[javac]\ %f:%l:\ %m,%-Z\ %#[javac]\ %p^,%-C%.%#
+autocmd BufNew,BufRead *.java set efm=%A\ %#[javac]\ %f:%l:\ %m,%-Z\ %#[javac]\ %p^,%-C%.%#
     \| set makeprg=ant\ -find\ build.xml
 
-map ,t :w<CR>
-map ,m :w\|:make<CR><CR>
-map ,- :nohl<CR>
-
 " remap ',t' in Go buffers to do :Fmt first
-autocmd BufNewFile,BufRead *.go map ,t :Fmt<CR>:w<CR>
+autocmd BufNew,BufRead *.go map ,t :Fmt<CR>:w<CR>
+
+" highlighting sbt as scala, too
+autocmd BufNew,BufRead *.sbt setf scala
 
 " (en|dis)able crosshairs!
 function! EnableCrosshairs()