diff --git a/vimrc b/vimrc
index 340d50d..53eea4a 100644
--- a/vimrc
+++ b/vimrc
@@ -66,10 +66,13 @@ set number
 set autoindent
 
 "" Colors
-syntax enable
 set background=dark
 colorscheme gotham256
+
+"" Language/filetype settings
+syntax enable
 filetype plugin on
+autocmd FileType yaml setlocal tabstop=2 shiftwidth=2 expandtab
 
 "" Ctags
 set path+=;/