diff --git a/sources_non_forked/vim-coffee-script/indent/coffee.vim b/sources_non_forked/vim-coffee-script/indent/coffee.vim
index 7bd82e3e..e83fa5a4 100644
--- a/sources_non_forked/vim-coffee-script/indent/coffee.vim
+++ b/sources_non_forked/vim-coffee-script/indent/coffee.vim
@@ -426,3 +426,8 @@ function! GetCoffeeIndent(curlnum)
   " No special rules applied, so use the default policy.
   exec 'return' s:GetDefaultPolicy(a:curlnum)
 endfunction
+
+" tab space
+setlocal expandtab
+setlocal tabstop=2 shiftwidth=2 softtabstop=2
+setlocal autoindent
diff --git a/sources_non_forked/vim-markdown/indent/markdown.vim b/sources_non_forked/vim-markdown/indent/markdown.vim
new file mode 100644
index 00000000..06ccb477
--- /dev/null
+++ b/sources_non_forked/vim-markdown/indent/markdown.vim
@@ -0,0 +1,3 @@
+set noexpandtab
+set tabstop=2
+set shiftwidth=2
diff --git a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
index a9781c74..2ea60f07 100644
--- a/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
+++ b/sources_non_forked/vim-zenroom2/plugin/zenroom2.vim
@@ -62,7 +62,7 @@ function! s:markdown_room()
     exec( "hi StatusLineNC " . l:highlightfgbgcolor )
 endfunction
 
-function! g:zenroom_goyo_before()
+function! g:Zenroom_goyo_before()
     if !has("gui_running")
         return
     endif
@@ -73,7 +73,7 @@ function! g:zenroom_goyo_before()
     endif
 endfunction
 
-function! g:zenroom_goyo_after()
+function! g:Zenroom_goyo_after()
     if !has("gui_running")
         return
     endif
@@ -87,4 +87,4 @@ function! g:zenroom_goyo_after()
     endif
 endfunction
 
-let g:goyo_callbacks = [ function('g:zenroom_goyo_before'), function('g:zenroom_goyo_after') ]
+let g:goyo_callbacks = [ function('g:Zenroom_goyo_before'), function('g:Zenroom_goyo_after') ]
diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index 68b79b82..be83d11a 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -175,9 +175,9 @@ set expandtab
 " Be smart when using tabs ;)
 set smarttab
 
-" 1 tab == 4 spaces
-set shiftwidth=4
-set tabstop=4
+" 1 tab == 2 spaces
+set shiftwidth=2
+set tabstop=2
 
 " Linebreak on 500 characters
 set lbr