diff --git a/etc/soft/vifm/commands b/etc/soft/vifm/commands
index e71c4c8..808a3b5 100644
--- a/etc/soft/vifm/commands
+++ b/etc/soft/vifm/commands
@@ -26,6 +26,7 @@ command vlc vlc %f
 command vlp vlp %f
 command vls vls %f
 
+command git git ls -- %c 2>&1 %m
 command tig tig %d
 
 command ext ext %f
@@ -34,9 +35,6 @@ command diff vimdiff %f %F
 command run !! ./%f
 command vim !nvim %f
 
-command git !!git %a
-command gitdf g st | grep '^[[:space:]]' | grep -v '\)$' | sed 's/[[:space:]]*//' %u
-
 command cal cal -y %m
 
 command xc xc %c
diff --git a/etc/soft/vifm/filetypes b/etc/soft/vifm/filetypes
index 3c1b9fe..ea199d8 100644
--- a/etc/soft/vifm/filetypes
+++ b/etc/soft/vifm/filetypes
@@ -1,12 +1,5 @@
 filetype *.vk vkdigest.py -f %f -c | w3m -T text/html
 
-" Подсветка синтаксиса
-fileviewer * vcat %f
-
-" Директории
-fileviewer */ \tree %f
-fileviewer .git/ git-info --no-pager --color=always %d
-
 " Текстовые форматы
 fileviewer *.doc antiword %f
 fileviewer *.docx docx2txt %f -
@@ -77,8 +70,6 @@ fileviewer *.iso isoinfo -l -i %c
 " Табулатуры
 fileviewer *.gp,*.gp3,*.gp4,*.gp5 gptinfo %c
 
-fileviewer *[^/] BAT_CONFIG_PATH="$SHELLRC/etc/soft/bat/bat.conf" bat %c
-
 " Монтирование ssh
 filetype *.ssh FUSE_MOUNT2|sshfs %PARAM %DESTINATION_DIR
 
@@ -87,3 +78,13 @@ filetype *.ftp
        \ {Mount with CurlFtpFS}
        \ FUSE_MOUNT2|curlftpfs -o ftp_port=-,,disable_eprt %PARAM %DESTINATION_DIR %CLEAR,
 
+fileviewer .git/ git ls --color -- %d 2>&1
+
+" Директории
+fileviewer */ tree -C %f
+fileviewer .*/ tree -C %f
+
+" Подсветка синтаксиса
+fileviewer * vcat %f
+fileviewer .* vcat %f
+