diff --git a/after/ftplugin/dirvish.vim b/after/ftplugin/dirvish.vim
index 1c7f963..f718a23 100644
--- a/after/ftplugin/dirvish.vim
+++ b/after/ftplugin/dirvish.vim
@@ -14,3 +14,10 @@ nmap <silent><buffer> yy <Plug>(dovish_yank)
 xmap <silent><buffer> yy <Plug>(dovish_yank)
 nmap <silent><buffer> p <Plug>(dovish_copy)
 " nmap <silent><buffer> P <Plug>(dovish_move)
+silent exe 'hi! link DirvishGitModified orange;
+silent exe 'hi! link DirvishGitStaged yellow;
+silent exe 'hi! link DirvishGitRenamed magenta;
+silent exe 'hi! link DirvishGitUnmerged violet;
+silent exe 'hi! link DirvishGitIgnored base2;
+silent exe 'hi! link DirvishGitUntracked base2;
+silent exe 'hi! link DirvishGitUntrackedDir DirvishPathTail;
diff --git a/after/syntax/dirvish.vim b/after/syntax/dirvish.vim
new file mode 100644
index 0000000..f49e9b4
--- /dev/null
+++ b/after/syntax/dirvish.vim
@@ -0,0 +1,7 @@
+hi! link DirvishGitModified orange
+hi! link DirvishGitStaged yellow
+hi! link DirvishGitRenamed magenta
+hi! link DirvishGitUnmerged violet
+hi! link DirvishGitIgnored base2
+hi! link DirvishGitUntracked base2
+hi! link DirvishGitUntrackedDir DirvishPathTail
diff --git a/vimrc b/vimrc
index e8b4b86..73613f7 100644
--- a/vimrc
+++ b/vimrc
@@ -122,3 +122,28 @@ augroup CursorLineOnlyInActiveWindow
   autocmd WinLeave * setlocal nocursorline
 augroup END
 
+augroup dirvish_config
+	autocmd!
+
+		" \ unmap <buffer> p
+		"
+	autocmd FileType dirvish
+		\ nmap <silent><buffer> o <Plug>(dovish_create_file)
+		\ | nmap <silent><buffer> O <Plug>(dovish_create_file)
+		\ | nmap <silent><buffer> dd <Plug>(dovish_delete)
+		\ | nmap <silent><buffer> c <Plug>(dovish_rename)
+		\ | nmap <silent><buffer> yy <Plug>(dovish_yank)
+		\ | xmap <silent><buffer> yy <Plug>(dovish_yank)
+		\ | nmap <silent><buffer> p <Plug>(dovish_copy)
+
+	autocmd FileType dirvish
+		\ hi! link DirvishGitModified orange
+		\ | hi! link DirvishGitStaged yellow
+		\ | hi! link DirvishGitRenamed magenta
+		\ | hi! link DirvishGitUnmerged violet
+		\ | hi! link DirvishGitIgnored base2
+		\ | hi! link DirvishGitUntracked base2
+		\ | hi! link DirvishGitUntrackedDir DirvishPathTail
+
+augroup END
+