diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index bcd9439..7a4010b 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -24,8 +24,8 @@ Plugin 'scrooloose/syntastic'
 " Git
 Plugin 'tpope/vim-fugitive'
 
-" NERD Commenter
-Plugin 'scrooloose/nerdcommenter'
+" Easy Commenting
+Plugin 'tpope/vim-commentary'
 
 " Surround - Easy changing of quotes and stuff
 Plugin 'tpope/vim-surround'
@@ -36,6 +36,12 @@ Plugin 'kien/ctrlp.vim'
 " Ack from vim
 Plugin 'mileszs/ack.vim'
 
+" Improved vim status bar
+Plugin 'bling/vim-airline'
+
+" Indent guides
+Plugin 'Yggdroot/indentLine'
+
 " Language specific syntax highlighting
 Plugin 'derekwyatt/vim-scala'
 Plugin 'kchmck/vim-coffee-script'
@@ -60,7 +66,6 @@ if !has("win32") || !has("win16")
   Plugin 'christoomey/vim-tmux-navigator'
 endif
 
-
 " Markdown
 Plugin 'godlygeek/tabular'
 Plugin 'plasticboy/vim-markdown'
@@ -154,3 +159,14 @@ if exists('+colorcolumn')
 else
   au BufWinEnter * let w:m2=matchadd('ErrorMsg', '\%>80v.\+', -1)
 endif
+
+" Indent lines customizations
+
+" Color customizations
+" let g:indentLine_color_term=###
+
+" Line indent guides are defaulted to off
+let g:indentLine_enabled=0
+
+" Leader + i will toggle line indent guides
+map <silent> <Leader>i :IndentLinesToggle<CR>
diff --git a/dotfiles/xmonad/xmonad-x86_64-linux b/dotfiles/xmonad/xmonad-x86_64-linux
index 48a6242..7d47de3 100755
Binary files a/dotfiles/xmonad/xmonad-x86_64-linux and b/dotfiles/xmonad/xmonad-x86_64-linux differ
diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index c581df7..4d1dfd2 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/dotfiles/xmonad/xmonad.hs
@@ -252,9 +252,9 @@ main = do
     ,((0                        , xF86XK_Sleep    ), spawn "pm-suspend")
     ,((0                        , xF86XK_MonBrightnessUp      ), spawn "xbacklight -inc 10")
     ,((0                        , xF86XK_MonBrightnessDown    ), spawn "xbacklight -dec 10")
-    --,((0                        , xF86XK_AudioMute), spawn "~/scripts/dvol2 -t")
-    --,((0                        , xF86XK_AudioLowerVolume), spawn "~/scripts/dvol2 -d 2 & mplayer /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga")
-    --,((0                        , xF86XK_AudioRaiseVolume ), spawn "~/scripts/dvol2 -i 2 & mplayer /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga")
+    ,((0                        , xF86XK_AudioMute), spawn "~/scripts/dvol2 -t")
+    ,((0                        , xF86XK_AudioLowerVolume), spawn "~/scripts/dvol2 -d 2 & mplayer /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga")
+    ,((0                        , xF86XK_AudioRaiseVolume ), spawn "~/scripts/dvol2 -i 2 & mplayer /usr/share/sounds/freedesktop/stereo/audio-volume-change.oga")
     ]
     `additionalMouseBindings`
     [((myModMask, 6), \_ -> moveTo Next NonEmptyWS)
diff --git a/dotfiles/xmonad/xmonad.o b/dotfiles/xmonad/xmonad.o
index 3078b15..dd67d67 100644
Binary files a/dotfiles/xmonad/xmonad.o and b/dotfiles/xmonad/xmonad.o differ