diff --git a/.config/nvim/init/general.vim b/.config/nvim/init/general.vim
index a83059f..6feeeb4 100644
--- a/.config/nvim/init/general.vim
+++ b/.config/nvim/init/general.vim
@@ -13,8 +13,7 @@ let &backupext="_" . strftime("%y%m%dT%H%M")
 set wildmode=longest,list,full " Auto-completion for cmdline
 set clipboard+=unnamedplus " Merge with system clipboard
 
-set shiftwidth=2 expandtab " Indentation
-"set shiftwidth=4 tabstop = 4 " Indentation for programming
+set shiftwidth=2 expandtab " Default simple indentation
 
 " visuals
 set number relativenumber " Relative line numbering on the left
diff --git a/.config/nvim/init/keys.vim b/.config/nvim/init/keys.vim
index b83c53d..4600efa 100644
--- a/.config/nvim/init/keys.vim
+++ b/.config/nvim/init/keys.vim
@@ -51,4 +51,7 @@ map <leader>ls :setlocal colorcolumn=81,121 nowrap<CR>
 map <leader>lw :setlocal colorcolumn=81 textwidth=80<CR>
 map <leader>ln :setlocal colorcolumn= textwidth=0 wrap<CR>
 
+map <leader>t :setlocal shiftwidth=4 tabstop=4 noexpandtab<CR>
+map <leader>T :setlocal shiftwidth=2 expandtab<CR>
+
 " }}}