diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 00a6a64..d82e100 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,3 +1,4 @@
 set expandtab
 set shiftwidth=2
 set softtabstop=2
+
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index 928bd24..fa8a91b 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,9 +1,9 @@
-"set tabstop=8
 set expandtab
-set softtabstop=4
 set shiftwidth=4
+set softtabstop=4
 set shiftround
 
 " Disable haskell-vim omnifunc
 let g:haskellmode_completion_ghc = 0
 autocmd FileType haskell setlocal omnifunc=necoghc#omnifunc
+
diff --git a/after/ftplugin/man.vim b/after/ftplugin/man.vim
index 0f28676..81512b2 100644
--- a/after/ftplugin/man.vim
+++ b/after/ftplugin/man.vim
@@ -1,12 +1,11 @@
 set readonly
-set nomod
+set nomodifiable
 set nolist
 set nocursorcolumn
 set colorcolumn=0
-set tabstop=8
 
+noremap q :q<CR>
+noremap <SPACE> <C-D>
+noremap b <C-U>
+nnoremap K :Man <C-R>=expand(\\\"<cword>\\\")<CR><CR>
 
-map q :q<CR>
-map <SPACE> <C-D>
-map b <C-U>
-nmap K :Man <C-R>=expand(\\\"<cword>\\\")<CR><CR>
diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index d5a9f89..126b8d4 100644
--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -1 +1,3 @@
 set expandtab
+set shiftwidth=4
+
diff --git a/after/ftplugin/ocaml.vim b/after/ftplugin/ocaml.vim
index 9186440..126b8d4 100644
--- a/after/ftplugin/ocaml.vim
+++ b/after/ftplugin/ocaml.vim
@@ -1,2 +1,3 @@
-set shiftwidth=4
 set expandtab
+set shiftwidth=4
+
diff --git a/after/ftplugin/pandoc.vim b/after/ftplugin/pandoc.vim
index d5a9f89..8e7a69f 100644
--- a/after/ftplugin/pandoc.vim
+++ b/after/ftplugin/pandoc.vim
@@ -1 +1,2 @@
 set expandtab
+set shiftwidth=4
diff --git a/after/ftplugin/python.vim b/after/ftplugin/python.vim
index 2b68c49..1a62802 100644
--- a/after/ftplugin/python.vim
+++ b/after/ftplugin/python.vim
@@ -1,3 +1,6 @@
+set expandtab
+set shiftwidth=4
 set foldmethod=indent
 set foldnestmax=2
 set formatoptions=croql
+
diff --git a/after/ftplugin/sh.vim b/after/ftplugin/sh.vim
index 6ac573b..3a20062 100644
--- a/after/ftplugin/sh.vim
+++ b/after/ftplugin/sh.vim
@@ -1,3 +1,5 @@
-set shiftwidth=4
 set expandtab
+set shiftwidth=4
+
 let g:sh_fold_enabled=1
+
diff --git a/after/ftplugin/snippets.vim b/after/ftplugin/snippets.vim
index c5eefef..8535f33 100644
--- a/after/ftplugin/snippets.vim
+++ b/after/ftplugin/snippets.vim
@@ -1,3 +1,4 @@
+set noexpandtab
 set shiftwidth=4
 set tabstop=4
-set noexpandtab
+
diff --git a/after/ftplugin/tex.vim b/after/ftplugin/tex.vim
index 4bc3931..76ba53b 100644
--- a/after/ftplugin/tex.vim
+++ b/after/ftplugin/tex.vim
@@ -1,3 +1,4 @@
+set noexpandtab
 set tabstop=4
 set shiftwidth=4
-set noexpandtab
+
diff --git a/after/ftplugin/vim.vim b/after/ftplugin/vim.vim
index b1774d2..7f4fe56 100644
--- a/after/ftplugin/vim.vim
+++ b/after/ftplugin/vim.vim
@@ -1,5 +1,8 @@
+set expandtab
 set shiftwidth=4
 set softtabstop=4
-set expandtab
-set foldmethod=syntax
+set foldmethod=marker
+set foldlevel=0
+
 let g:vimsyn_folding='af'
+
diff --git a/after/ftplugin/yaml.vim b/after/ftplugin/yaml.vim
new file mode 100644
index 0000000..225749f
--- /dev/null
+++ b/after/ftplugin/yaml.vim
@@ -0,0 +1,3 @@
+set expandtab
+set shiftwidth=2
+