diff --git a/vim/config/after.vim b/vim/config/after.vim
index 6f10094..e81766d 100644
--- a/vim/config/after.vim
+++ b/vim/config/after.vim
@@ -45,7 +45,7 @@ autocmd FileChangedRO * nested set noreadonly
 
     "filtype specific settings
     autocmd BufEnter,FileType sh setlocal iskeyword-=.
-    autocmd Filetype text,mkd,mkdc,gitcommit,notes,mail,notmuch,rst,taskreport setlocal nonumber spell nolist linebreak breakat&vim breakat-=* breakat-=. breakat-=/ breakat-=? breakat-=, breakat-=: breakat-=; breakat-=! "set some defaults for word processing
+    autocmd Filetype text,markdown,mkdc,gitcommit,notes,mail,notmuch,rst,taskreport setlocal nonumber spell nolist linebreak tabstop=2 shiftwidth=2 breakat&vim breakat-=* breakat-=. breakat-=/ breakat-=? breakat-=, breakat-=: breakat-=; breakat-=! "set some defaults for word processing
     autocmd Filetype text,gitcommit,notes,mail,notmuch,rst,taskreport setlocal wrap
     autocmd FileType tmux,taskrc setlocal commentstring=#\ %s "set the comment string to #
     autocmd FileType slrnrc setlocal commentstring=%%\ %s "set the comment string to %
diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim
index 8dd5c35..235f6f6 100644
--- a/vim/config/keyboard.vim
+++ b/vim/config/keyboard.vim
@@ -839,8 +839,8 @@
     endif
 
     "markdown
-    autocmd FileType mkd nnoremap <buffer> <silent><expr> <Leader>f ':TableFormat<CR>'
-    autocmd FileType mkd xnoremap <buffer> <silent><expr> <Leader>f '<Esc>:TableFormat<CR>gv'
+    autocmd FileType markdown nnoremap <buffer> <silent><expr> <Leader>f ':TableFormat<CR>'
+    autocmd FileType markdown xnoremap <buffer> <silent><expr> <Leader>f '<Esc>:TableFormat<CR>gv'
 
     "qf-sidebar
     autocmd FileType qf map <buffer> <LeftMouse> <LeftMouse>0