diff --git a/vimrc b/vimrc
index 913ed3f..f424841 100644
--- a/vimrc
+++ b/vimrc
@@ -1,22 +1,26 @@
 call plug#begin('~/.vim/plugged')
-Plug 'jiangmiao/auto-pairs'
+Plug 'jiangmiao/auto-pairs'             " Automapic closing of quotes
 Plug 'flazz/vim-colorschemes'           " ColorChemes pack
 Plug 'airblade/vim-gitgutter'           " Git indecator
-Plug 'kien/ctrlp.vim'                   " Search file
-Plug 'ap/vim-css-color', {'for': 'css'} " CSS color
 call plug#end()
 
+set nocompatible    " be iMproved
+
 set number		    " Number line
+set relativenumber  " Number line
+
 syntax on		    " Support syntax
 set mouse=a		    " Mousr support
 set ruler		    " Cursor position
-set hidden		    " hidden buffers
-set smartindent		" hidden buffers
 set t_Co=256		" Enable 265 colors
+
 set encoding=utf-8	" Use utf-8 encoding
+set fileencodings=utf8,cp1251
 
 set cursorline		" The line with the cursor will be highlighted
-set wrap	    	" Line wrapping
+set wrap	    	" Line wrappingv
+set linebreak      	" Line wrappingv
+
 set nobackup		" Disable backup files
 set noswapfile		" Disable *.swp files
 set history=1000	" History size 1000 edits
@@ -28,14 +32,23 @@ set showcmd
 " Tab
 set tabstop=4		" Tab size 4
 set shiftwidth=4    " Tab size 4
+set softtabstop=4   " Tab size 4
 set expandtab		" Tab consist of space
-set smarttab        " Tab consist of space
+set smarttab
+set autoindent
+
 
 " Search
 set incsearch		" Highlighted
 set ignorecase		" Highlighted
 set smartcase		" Smart Rigger
 
+" Buffers
+set hidden
+set smartindent	
+
+set visualbell t_vb=    " Mute Vim
+
 " ColoerCheme
 set background=dark
 colorscheme OceanicNext
@@ -56,19 +69,19 @@ map <C-h> <C-W>h
 map <C-l> <C-W>l
 
 " Tabs
-map <leader>tn :tabnew<cr>      " Create new tab
-map <leader>to :tabonly<cr>     " Kill all tab
-map <leader>tc :tabclose<cr>    " Tab kill
-map <leader>1 :tabn 1<cr>       " Change tab
-map <leader>2 :tabn 2<cr>       " Change tab
-map <leader>3 :tabn 3<cr>       " Change tab
-map <leader>4 :tabn 4<cr>       " Change tab
-map <leader>5 :tabn 5<cr>       " Change tab
-map <leader>6 :tabn 6<cr>       " Change tab
-map <leader>7 :tabn 7<cr>       " Change tab
-map <leader>8 :tabn 8<cr>       " Change tab
-map <leader>9 :tabn 9<cr>       " Change tab
-map <leader>0 :tablast<cr>      " Change tab
+map <leader>tn :tabnew<CR>      " CReate new tab
+map <leader>to :tabonly<CR>     " Kill all tab
+map <leader>tc :tabclose<CR>    " Tab kill
+map <leader>1 :tabn 1<CR>       " Change tab
+map <leader>2 :tabn 2<CR>       " Change tab
+map <leader>3 :tabn 3<CR>       " Change tab
+map <leader>4 :tabn 4<CR>       " Change tab
+map <leader>5 :tabn 5<CR>       " Change tab
+map <leader>6 :tabn 6<CR>       " Change tab
+map <leader>7 :tabn 7<CR>       " Change tab
+map <leader>8 :tabn 8<CR>       " Change tab
+map <leader>9 :tabn 9<CR>       " Change tab
+map <leader>0 :tablast<CR>      " Change tab
 
 " Russian letters
 map ш i
@@ -81,14 +94,28 @@ map о j
 map л k
 map д l
 
+" Bufer
+nnoremap <C-N> :bnext<CR>
+nnoremap <C-P> :bprev<CR>
+
 " Unmap arrows
 noremap <Up> <NOP>
 noremap <Down> <NOP>
 noremap <Left> <NOP>
 noremap <Right> <NOP>
 
+""""""""
+" GVIM "
+""""""""
 if has("gui_running")
     set guioptions -=m
     set guioptions -=T
-    map <leader>p "+gP 
+    map <leader>p "+gP          " Past test in buffer
+    map <C-Tab> :tabnext<cr>    " Change tab
+    map <C-S-Tab> :tabprev<cr>  " Change tab
 endif
+
+" Python
+let python_highlight_all = 1
+autocmd BufWritePre *.py normal m`:%s/\s\+$//e `
+autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class