diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim
index f80164bf..837469f7 100644
--- a/vimrcs/basic.vim
+++ b/vimrcs/basic.vim
@@ -189,9 +189,8 @@ set tabstop=4
 set lbr
 set tw=500
 
-set cindent
-set cinkeys-=0#
-set indentkeys-=0#
+set ai "Auto indent
+set si "Smart indent
 set wrap "Wrap lines
 
 
diff --git a/vimrcs/filetypes.vim b/vimrcs/filetypes.vim
index 9ac5c552..8c4eb9db 100644
--- a/vimrcs/filetypes.vim
+++ b/vimrcs/filetypes.vim
@@ -17,6 +17,9 @@ au FileType python map <buffer> <leader>1 /class
 au FileType python map <buffer> <leader>2 /def 
 au FileType python map <buffer> <leader>C ?class 
 au FileType python map <buffer> <leader>D ?def 
+au FileType python set cindent
+au FileType python set cinkeys-=0#
+au FileType python set indentkeys-=0#
 
 
 """"""""""""""""""""""""""""""