diff --git a/.gitignore b/.gitignore
index a4ebd99..8bb5606 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 bin
 var
+vpn
 
 etc/mail/fetchmail/fetchmailrc
 etc/mail/mutt/boxes.mutt
diff --git a/etc/X/XCompose b/etc/X/XCompose
index 962f961..b79166b 100644
--- a/etc/X/XCompose
+++ b/etc/X/XCompose
@@ -17,10 +17,6 @@ include "%L"
 <Multi_key> <s> <Z> : "Ž"
 <Multi_key> <s> <Z> : "Š"
 
-<Multi_key> <s> <C> : "Ћ"
-<Multi_key> <s> <J> : "Ђ"
-<Multi_key> <s> <G> : "Џ"
-
 <Multi_key> <k> <c> : "ћ"
 <Multi_key> <k> <j> : "ђ"
 <Multi_key> <k> <g> : "џ"
diff --git a/etc/soft/vifm/commands b/etc/soft/vifm/commands
index a782a1e..1b517c0 100644
--- a/etc/soft/vifm/commands
+++ b/etc/soft/vifm/commands
@@ -2,7 +2,7 @@
 command! Q :execute '!echo %d > ~/.vifm/lastdir' | quit
 
 command df dfc -t ext4,fuseblk -w %m 2> /dev/null
-command dus noc dus %d/* %m
+command dus dus %d/* %q
 command dmesg dmesg %m
 
 " TMSU
@@ -18,6 +18,8 @@ command fb fb2 %c:p %m
 
 command t t -p %a %m
 
+command ttr ttr %f
+
 command nt nt %a %m
 
 command vlc vlc %f
@@ -30,8 +32,10 @@ command ext ext %f
 
 command diff vimdiff %f %F
 command run !! ./%f
-command vim !vim %a
+command vim !vim %f
+
 command git !!git %a
+command gitdf g st | grep '^[[:space:]]' | grep -v '\)$' | sed 's/[[:space:]]*//' %u
 
 command cal cal -y %m
 
diff --git a/etc/soft/vifm/filetypes b/etc/soft/vifm/filetypes
index 6b58839..ca92307 100644
--- a/etc/soft/vifm/filetypes
+++ b/etc/soft/vifm/filetypes
@@ -21,8 +21,7 @@ filetype *.txt vim %f
 " img
 filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif viewnior %c
 filextype *.svg sensible-browser %f &
-" fileviewer *.jpg imgv %px %py %pw %ph %c
-" fileviewer *.jpg lsi %f
+fileviewer *.jpg,*.png lsimg %f %q %pc
 
 " audio
 filextype *.mp3,*.wav,*.flac,*.ogg,*.m4a vlc %f &
@@ -46,11 +45,12 @@ fileviewer *.pdf pdftotext -nopgbrk %f -
 
 " djvu
 filextype *.djvu
+  \ zathura %f &,
   \ qpdfview %f &,
   \ djview %f &
 filetype *.djvu apvlv %f &
 
-" ebook
+" ebooks
 filextype *.fb2,*.mobi,*.epub,*.chm,*.fb2.zip pybr %f &
 
 " web-страницы
@@ -72,3 +72,11 @@ fileviewer *.gp,*.gp3,*.gp4,*.gp5 gptinfo %c
 
 fileviewer *[^/] vcat %c
 
+" Монтирование ssh
+filetype *.ssh FUSE_MOUNT2|sshfs %PARAM %DESTINATION_DIR
+
+" Монтирование FTP
+filetype *.ftp
+       \ {Mount with CurlFtpFS}
+       \ FUSE_MOUNT2|curlftpfs -o ftp_port=-,,disable_eprt %PARAM %DESTINATION_DIR %CLEAR,
+
diff --git a/etc/soft/vifm/vifmrc b/etc/soft/vifm/vifmrc
index 4a09a86..84f9cbe 100644
--- a/etc/soft/vifm/vifmrc
+++ b/etc/soft/vifm/vifmrc
@@ -18,7 +18,9 @@ set incsearch
 set nowrap
 
 set timefmt="%d.%m.%y %H:%M"
-set statusline="  %t%= %A %10u:%-7g %15s %20d  "
+set statusline="  %t %T%= %A %10u:%-7g %15s %20d [%a] %D "
+
+set slowfs=curlftpfs
 
 source ~/.vifm/marks
 source ~/.vifm/filetypes
diff --git a/etc/soft/vim/vim/colors/wombat_converted.vim b/etc/soft/vim/vim/colors/wombat_converted.vim
index f1c1065..593a60d 100644
--- a/etc/soft/vim/vim/colors/wombat_converted.vim
+++ b/etc/soft/vim/vim/colors/wombat_converted.vim
@@ -7,53 +7,53 @@ endif
 let g:colors_name = "wombat_converted.vim"
 hi Normal guifg=#cccccc ctermfg=252
 hi Normal guibg=#242424 ctermbg=235
-hi Normal gui=none cterm=none
-hi SpecialKey gui=none guifg=Cyan guibg=none cterm=none ctermfg=51 ctermbg=none
-hi NonText gui=bold guifg=Blue guibg=none cterm=bold ctermfg=21 ctermbg=none
-hi Directory gui=none guifg=Cyan guibg=none cterm=none ctermfg=51 ctermbg=none
-hi ErrorMsg gui=none guifg=White guibg=Red cterm=none ctermfg=231 ctermbg=196
-hi IncSearch gui=reverse guifg=none guibg=none cterm=reverse ctermfg=none ctermbg=none
-hi Search gui=none guifg=Black guibg=Yellow cterm=none ctermfg=16 ctermbg=226
-hi MoreMsg gui=bold guifg=SeaGreen guibg=none cterm=bold ctermfg=29 ctermbg=none
-hi ModeMsg gui=bold guifg=none guibg=none cterm=bold ctermfg=none ctermbg=none
-hi LineNr gui=none guifg=Yellow guibg=none cterm=none ctermfg=226 ctermbg=none
-hi Question gui=bold guifg=Green guibg=none cterm=bold ctermfg=46 ctermbg=none
-hi StatusLine gui=bold,reverse guifg=none guibg=none cterm=bold,reverse ctermfg=none ctermbg=none
-hi StatusLineNC gui=reverse guifg=none guibg=none cterm=reverse ctermfg=none ctermbg=none
-hi VertSplit gui=reverse guifg=none guibg=none cterm=reverse ctermfg=none ctermbg=none
-hi Title gui=bold guifg=Magenta guibg=none cterm=bold ctermfg=201 ctermbg=none
-hi Visual gui=none guifg=none guibg=DarkGrey cterm=none ctermfg=none ctermbg=248
-hi VisualNOS gui=bold,underline guifg=none guibg=none cterm=bold,underline ctermfg=none ctermbg=none
-hi WarningMsg gui=none guifg=Red guibg=none cterm=none ctermfg=196 ctermbg=none
-hi WildMenu gui=none guifg=Black guibg=Yellow cterm=none ctermfg=16 ctermbg=226
-hi Folded gui=none guifg=Cyan guibg=DarkGrey cterm=none ctermfg=51 ctermbg=248
-hi FoldColumn gui=none guifg=Cyan guibg=Grey cterm=none ctermfg=51 ctermbg=250
-hi DiffAdd gui=none guifg=none guibg=DarkBlue cterm=none ctermfg=none ctermbg=18
-hi DiffChange gui=none guifg=none guibg=DarkMagenta cterm=none ctermfg=none ctermbg=90
+hi Normal gui=NONE cterm=NONE
+hi SpecialKey gui=NONE guifg=Cyan guibg=NONE cterm=NONE ctermfg=51 ctermbg=NONE
+hi NonText gui=bold guifg=Blue guibg=NONE cterm=bold ctermfg=21 ctermbg=NONE
+hi Directory gui=NONE guifg=Cyan guibg=NONE cterm=NONE ctermfg=51 ctermbg=NONE
+hi ErrorMsg gui=NONE guifg=White guibg=Red cterm=NONE ctermfg=231 ctermbg=196
+hi IncSearch gui=reverse guifg=NONE guibg=NONE cterm=reverse ctermfg=NONE ctermbg=NONE
+hi Search gui=NONE guifg=Black guibg=Yellow cterm=NONE ctermfg=16 ctermbg=226
+hi MoreMsg gui=bold guifg=SeaGreen guibg=NONE cterm=bold ctermfg=29 ctermbg=NONE
+hi ModeMsg gui=bold guifg=NONE guibg=NONE cterm=bold ctermfg=NONE ctermbg=NONE
+hi LineNr gui=NONE guifg=Yellow guibg=NONE cterm=NONE ctermfg=226 ctermbg=NONE
+hi Question gui=bold guifg=Green guibg=NONE cterm=bold ctermfg=46 ctermbg=NONE
+hi StatusLine gui=bold,reverse guifg=NONE guibg=NONE cterm=bold,reverse ctermfg=NONE ctermbg=NONE
+hi StatusLineNC gui=reverse guifg=NONE guibg=NONE cterm=reverse ctermfg=NONE ctermbg=NONE
+hi VertSplit gui=reverse guifg=NONE guibg=NONE cterm=reverse ctermfg=NONE ctermbg=NONE
+hi Title gui=bold guifg=Magenta guibg=NONE cterm=bold ctermfg=201 ctermbg=NONE
+hi Visual gui=NONE guifg=NONE guibg=DarkGrey cterm=NONE ctermfg=NONE ctermbg=248
+hi VisualNOS gui=bold,underline guifg=NONE guibg=NONE cterm=bold,underline ctermfg=NONE ctermbg=NONE
+hi WarningMsg gui=NONE guifg=Red guibg=NONE cterm=NONE ctermfg=196 ctermbg=NONE
+hi WildMenu gui=NONE guifg=Black guibg=Yellow cterm=NONE ctermfg=16 ctermbg=226
+hi Folded gui=NONE guifg=Cyan guibg=DarkGrey cterm=NONE ctermfg=51 ctermbg=248
+hi FoldColumn gui=NONE guifg=Cyan guibg=Grey cterm=NONE ctermfg=51 ctermbg=250
+hi DiffAdd gui=NONE guifg=NONE guibg=DarkBlue cterm=NONE ctermfg=NONE ctermbg=18
+hi DiffChange gui=NONE guifg=NONE guibg=DarkMagenta cterm=NONE ctermfg=NONE ctermbg=90
 hi DiffDelete gui=bold guifg=Blue guibg=DarkCyan cterm=bold ctermfg=21 ctermbg=30
-hi DiffText gui=bold guifg=none guibg=Red cterm=bold ctermfg=none ctermbg=196
-hi SignColumn gui=none guifg=Cyan guibg=Grey cterm=none ctermfg=51 ctermbg=250
-hi SpellBad gui=undercurl guifg=none guisp=Red cterm=undercurl ctermfg=none ctermbg=196
-hi SpellCap gui=undercurl guifg=none guisp=Blue cterm=undercurl ctermfg=none ctermbg=21
-hi SpellRare gui=undercurl guifg=none guisp=Magenta cterm=undercurl ctermfg=none ctermbg=201
-hi SpellLocal gui=undercurl guifg=none guisp=Cyan cterm=undercurl ctermfg=none ctermbg=51
-hi Pmenu gui=none guifg=none guibg=Magenta cterm=none ctermfg=none ctermbg=201
-hi PmenuSel gui=none guifg=none guibg=DarkGrey cterm=none ctermfg=none ctermbg=248
-hi PmenuSbar gui=none guifg=none guibg=Grey cterm=none ctermfg=none ctermbg=250
-hi PmenuThumb gui=reverse guifg=none guibg=none cterm=reverse ctermfg=none ctermbg=none
-hi TabLine gui=underline guifg=none guibg=DarkGrey cterm=underline ctermfg=none ctermbg=248
-hi TabLineSel gui=bold guifg=none guibg=none cterm=bold ctermfg=none ctermbg=none
-hi TabLineFill gui=reverse guifg=none guibg=none cterm=reverse ctermfg=none ctermbg=none
-hi CursorColumn gui=none guifg=none guibg=Grey40 cterm=none ctermfg=none ctermbg=241
-hi CursorLine gui=none guifg=none guibg=Grey40 cterm=none ctermfg=none ctermbg=241
-hi Cursor gui=reverse guifg=none guibg=none cterm=reverse ctermfg=none ctermbg=none
-hi lCursor gui=reverse guifg=none guibg=none cterm=reverse ctermfg=none ctermbg=none
-hi MatchParen gui=none guifg=none guibg=DarkCyan cterm=none ctermfg=none ctermbg=30
+hi DiffText gui=bold guifg=NONE guibg=Red cterm=bold ctermfg=NONE ctermbg=196
+hi SignColumn gui=NONE guifg=Cyan guibg=Grey cterm=NONE ctermfg=51 ctermbg=250
+hi SpellBad gui=undercurl guifg=NONE guisp=Red cterm=undercurl ctermfg=NONE ctermbg=196
+hi SpellCap gui=undercurl guifg=NONE guisp=Blue cterm=undercurl ctermfg=NONE ctermbg=21
+hi SpellRare gui=undercurl guifg=NONE guisp=Magenta cterm=undercurl ctermfg=NONE ctermbg=201
+hi SpellLocal gui=undercurl guifg=NONE guisp=Cyan cterm=undercurl ctermfg=NONE ctermbg=51
+hi Pmenu gui=NONE guifg=NONE guibg=Magenta cterm=NONE ctermfg=NONE ctermbg=201
+hi PmenuSel gui=NONE guifg=NONE guibg=DarkGrey cterm=NONE ctermfg=NONE ctermbg=248
+hi PmenuSbar gui=NONE guifg=NONE guibg=Grey cterm=NONE ctermfg=NONE ctermbg=250
+hi PmenuThumb gui=reverse guifg=NONE guibg=NONE cterm=reverse ctermfg=NONE ctermbg=NONE
+hi TabLine gui=underline guifg=NONE guibg=DarkGrey cterm=underline ctermfg=NONE ctermbg=248
+hi TabLineSel gui=bold guifg=NONE guibg=NONE cterm=bold ctermfg=NONE ctermbg=NONE
+hi TabLineFill gui=reverse guifg=NONE guibg=NONE cterm=reverse ctermfg=NONE ctermbg=NONE
+hi CursorColumn gui=NONE guifg=NONE guibg=Grey40 cterm=NONE ctermfg=NONE ctermbg=241
+hi CursorLine gui=NONE guifg=NONE guibg=Grey40 cterm=NONE ctermfg=NONE ctermbg=241
+hi Cursor gui=reverse guifg=NONE guibg=NONE cterm=reverse ctermfg=NONE ctermbg=NONE
+hi lCursor gui=reverse guifg=NONE guibg=NONE cterm=reverse ctermfg=NONE ctermbg=NONE
+hi MatchParen gui=NONE guifg=NONE guibg=DarkCyan cterm=NONE ctermfg=NONE ctermbg=30
 hi Cursor guifg=#222222 ctermfg=235
 hi Cursor guibg=#ecee90 ctermbg=228
-hi Cursor gui=none cterm=none
+hi Cursor gui=NONE cterm=NONE
 hi CursorLine guibg=#32322e ctermbg=236
-hi CursorLine gui=none cterm=none
+hi CursorLine gui=NONE cterm=NONE
 hi CursorColumn guibg=#2d2d2d ctermbg=236
 hi Search guifg=#d787ff ctermfg=177
 hi Search guibg=#5f5f5f ctermbg=59
@@ -62,53 +62,53 @@ hi MatchParen guibg=#857b6f ctermbg=243
 hi MatchParen gui=bold cterm=bold
 hi SpecialKey guifg=#6c6c6c ctermfg=242
 hi SpecialKey guibg=#2d2d2d ctermbg=236
-hi SpecialKey gui=none cterm=none
+hi SpecialKey gui=NONE cterm=NONE
 hi Visual guifg=#ecee90 ctermfg=228
 hi Visual guibg=#597418 ctermbg=64
-hi Visual gui=none cterm=none
+hi Visual gui=NONE cterm=NONE
 hi LineNr guifg=#857b6f ctermfg=243
 hi LineNr guibg=#121212 ctermbg=233
-hi LineNr gui=none cterm=none
+hi LineNr gui=NONE cterm=NONE
 hi Folded guifg=#a0a8b0 ctermfg=248
 hi Folded guibg=#404048 ctermbg=238
-hi Folded gui=none cterm=none
+hi Folded gui=NONE cterm=NONE
 hi Title guifg=#f6f3e8 ctermfg=15
 hi Title gui=bold cterm=bold
 hi VertSplit guifg=#444444 ctermfg=238
 hi VertSplit guibg=#444444 ctermbg=238
-hi VertSplit gui=none cterm=none
+hi VertSplit gui=NONE cterm=NONE
 hi StatusLine guifg=#f6f3e8 ctermfg=15
 hi StatusLine guibg=#444444 ctermbg=238
 hi StatusLine gui=italic
 hi StatusLineNC guifg=#857b6f ctermfg=243
 hi StatusLineNC guibg=#444444 ctermbg=238
-hi StatusLineNC gui=none cterm=none
+hi StatusLineNC gui=NONE cterm=NONE
 hi Pmenu guifg=#f6f3e8 ctermfg=15
 hi Pmenu guibg=#444444 ctermbg=238
 hi PmenuSel guifg=#121212 ctermfg=233
 hi PmenuSel guibg=#caeb82 ctermbg=186
 hi WarningMsg guifg=#ff0000 ctermfg=196
 hi Number guifg=#e5786d ctermfg=173
-hi Number gui=none cterm=none
+hi Number gui=NONE cterm=NONE
 hi Constant guifg=#e5786d ctermfg=173
-hi Constant gui=none cterm=none
+hi Constant gui=NONE cterm=NONE
 hi String guifg=#95e454 ctermfg=113
 hi String gui=italic
 hi Comment guifg=#c0bc6c ctermfg=143
 hi Comment gui=italic
 hi Identifier guifg=#caeb82 ctermfg=186
-hi Identifier gui=none cterm=none
+hi Identifier gui=NONE cterm=NONE
 hi Keyword guifg=#87afff ctermfg=111
-hi Keyword gui=none cterm=none
+hi Keyword gui=NONE cterm=NONE
 hi Statement guifg=#87afff ctermfg=111
-hi Statement gui=none cterm=none
+hi Statement gui=NONE cterm=NONE
 hi Function guifg=#caeb82 ctermfg=186
-hi Function gui=none cterm=none
+hi Function gui=NONE cterm=NONE
 hi PreProc guifg=#e5786d ctermfg=173
-hi PreProc gui=none cterm=none
+hi PreProc gui=NONE cterm=NONE
 hi Type guifg=#caeb82 ctermfg=186
-hi Type gui=none cterm=none
+hi Type gui=NONE cterm=NONE
 hi Special guifg=#ffdead ctermfg=223
-hi Special gui=none cterm=none
+hi Special gui=NONE cterm=NONE
 hi Todo guifg=#857b6f ctermfg=243
 hi Todo gui=italic
diff --git a/etc/soft/vim/vimrc b/etc/soft/vim/vimrc
index b2f249f..0ea6f10 100644
--- a/etc/soft/vim/vimrc
+++ b/etc/soft/vim/vimrc
@@ -198,15 +198,15 @@ colo wombat_converted                                 " Цветовая схе
 
 "Грамматические ошибки
 hi clear SpellBad
-hi SpellBad cterm=bold ctermfg=160 ctermbg=none
+hi SpellBad cterm=bold ctermfg=160 ctermbg=NONE
 
 "Ошибки в заглавных буквах
 hi clear SpellCap 
-hi SpellCap cterm=bold ctermfg=110 ctermbg=none
+hi SpellCap cterm=bold ctermfg=110 ctermbg=NONE
 
 "Стилистические ошибки
 hi clear SpellLocal 
-hi SpellLocal cterm=bold ctermfg=120 ctermbg=none
+hi SpellLocal cterm=bold ctermfg=120 ctermbg=NONE
 
 hi Todo		ctermfg=black ctermbg=221        	" Метки TODO