diff --git a/plugins/airline.vim b/plugins/airline.vim
new file mode 100644
index 0000000..65bf626
--- /dev/null
+++ b/plugins/airline.vim
@@ -0,0 +1,5 @@
+let g:airline#extensions#tabline#enabled = 1
+let g:airline_powerline_fonts = 1
+
+set laststatus=2
+set noshowmode
diff --git a/plugins/haskellmode.vim b/plugins/haskellmode.vim
new file mode 100644
index 0000000..11973e7
--- /dev/null
+++ b/plugins/haskellmode.vim
@@ -0,0 +1,3 @@
+let g:haddock_browser="/usr/bin/chromium"
+
+"au BufEnter *.hs compiler ghc
diff --git a/plugins/molokai.vim b/plugins/molokai.vim
index a1ba716..671c27b 100644
--- a/plugins/molokai.vim
+++ b/plugins/molokai.vim
@@ -1,6 +1,4 @@
-"colorscheme molokai 
-
-"set background=dark
+set background=dark
 
 "let g:molokai_original = 1
-"let g:rehash256 = 1
+let g:rehash256 = 1
diff --git a/plugins/pandoc.vim b/plugins/pandoc.vim
index 2035354..a4d98c8 100644
--- a/plugins/pandoc.vim
+++ b/plugins/pandoc.vim
@@ -1,5 +1,5 @@
 " the filetypes for which vim-pandoc should be used
-let g:pandoc#filetypes#handles = [ "pandoc", "markdown" ]
+let g:pandoc#filetypes#handles = [ "markdown", "pandoc" ]
 
 " enable pandoc for markdown
 let g:pandoc#filetypes#pandoc_markdown = 1
diff --git a/plugins/powerline.vim b/plugins/powerline.vim
index 9060d04..ab64305 100644
--- a/plugins/powerline.vim
+++ b/plugins/powerline.vim
@@ -1,6 +1,8 @@
-set laststatus=2
-set noshowmode
-set showtabline=2
+"set noshowmode
+
+"if has('windows')
+    "set showtabline=2
+"endif
 
 let g:powerline_pycmd  = "py3"
 let g:powerline_pyeval = g:powerline_pycmd . "eval"
diff --git a/plugins/seoul256.vim b/plugins/seoul256.vim
index 179cd95..367fa94 100644
--- a/plugins/seoul256.vim
+++ b/plugins/seoul256.vim
@@ -14,7 +14,6 @@
 
 let g:seoul256_background       = 237
 let g:seoul256_light_background = 254
-colorscheme seoul256
 
 function! ToggleColorscheme()
     if g:colors_name == 'seoul256'
diff --git a/plugins/tmux.vim b/plugins/tmux.vim
deleted file mode 100644
index f2f400f..0000000
--- a/plugins/tmux.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-if exists('$TMUX')
-	function! TmuxOrSplitSwitch(wincmd, tmuxdir)
-		let previous_winnr = winnr()
-		silent! execute "wincmd " . a:wincmd
-		if previous_winnr == winnr()
-			call system("tmux select-pane -" . a:tmuxdir)
-			redraw!
-		endif
-	endfunction
-
-	let previous_title = substitute(system("tmux display-message -p '#{pane_title}'"), '\n', '', '')
-	let &t_ti = "\<Esc>]2;vim\<Esc>\\" . &t_ti
-	let &t_te = "\<Esc>]2;". previous_title . "\<Esc>\\" . &t_te
-
-	noremap <silent><C-h> :call TmuxOrSplitSwitch('h', 'L')<cr>
-	noremap <silent><C-l> :call TmuxOrSplitSwitch('l', 'R')<cr>
-	noremap <silent><C-k> :call TmuxOrSplitSwitch('k', 'U')<cr>
-	noremap <silent><C-j> :call TmuxOrSplitSwitch('j', 'D')<cr>
-	noremap <silent><C-b> :call TmuxOrSplitSwitch('b', 'l')<cr>
-else
-	noremap <C-h> <C-w>h
-	noremap <C-j> <C-w>j
-	noremap <C-k> <C-w>k
-	noremap <C-l> <C-w>l
-endif
diff --git a/plugins/youcompleteme.vim b/plugins/youcompleteme.vim
index 493752a..644c48d 100644
--- a/plugins/youcompleteme.vim
+++ b/plugins/youcompleteme.vim
@@ -1,4 +1,5 @@
 let g:ycm_global_ycm_extra_conf = g:vim_config_home . "/plugins/youcompleteme/ycm_extra_conf.py"
+
 let g:ycm_autoclose_preview_window_after_completion = 1
 let g:ycm_register_as_syntastic_checker = 1
 let g:ycm_server_keep_logfile = 1
diff --git a/plugins/youcompleteme/ycm_extra_conf.py b/plugins/youcompleteme/ycm_extra_conf.py
index 6547894..ba885c9 100644
--- a/plugins/youcompleteme/ycm_extra_conf.py
+++ b/plugins/youcompleteme/ycm_extra_conf.py
@@ -9,7 +9,7 @@ import ycm_core
 # "flags" list of compilation flags. Notice that YCM itself uses that approach.
 compilation_database_folder = ""
 
-flags = [ "-Wall", "-Werror", "-std=c99" ]
+flags = [ "-Wall", "-Werror", "-std=c11" ]
 
 if os.path.exists( compilation_database_folder ):
     database = ycm_core.CompilationDatabase( compilation_database_folder )