From b54988e61abe5ab1c011049c8610392c258f4205 Mon Sep 17 00:00:00 2001
From: jdhao <jdhao@hotmail.com>
Date: Thu, 22 Oct 2020 00:09:51 +0800
Subject: [PATCH] update colorscheme

---
 plugins.vim |  5 +++--
 ui.vim      | 27 ++++++++-------------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/plugins.vim b/plugins.vim
index cd07c31..d26df33 100644
--- a/plugins.vim
+++ b/plugins.vim
@@ -97,11 +97,12 @@ endif
 " A list of colorscheme plugin you may want to try. Find what suits you.
 Plug 'lifepillar/vim-gruvbox8'
 Plug 'srcery-colors/srcery-vim'
-Plug 'sjl/badwolf'
 Plug 'ajmwagar/vim-deus'
 Plug 'https://gitlab.com/yorickpeterse/happy_hacking.vim.git'
 Plug 'lifepillar/vim-solarized8'
-Plug 'patstockwell/vim-monokai-tasty'
+" Do not try other monokai-tasty and monokai-pro anymore, they
+" all have bad DiffDelete highlight issues.
+Plug 'sickill/vim-monokai'
 Plug 'rakr/vim-one'
 Plug 'kaicataldo/material.vim'
 Plug 'joshdick/onedark.vim'
diff --git a/ui.vim b/ui.vim
index 6db458e..aca4cce 100644
--- a/ui.vim
+++ b/ui.vim
@@ -12,13 +12,7 @@ set background=dark
 "}}
 
 "{{ Colorscheme settings
-let s:candidate_theme = ['gruvbox8', 'srcery', 'badwolf', 'deus', 'happy_hacking', 'solarized8',
-      \ 'monokai_tasty', 'vim_one', 'material', 'onedark']
-let s:idx = utils#RandInt(0, len(s:candidate_theme)-1)
-let s:theme = s:candidate_theme[s:idx]
-
 let s:my_theme_dict = {}
-
 function! s:my_theme_dict.srcery() dict abort
   colorscheme srcery
 endfunction
@@ -43,15 +37,6 @@ function! s:my_theme_dict.srcery() dict abort
   colorscheme srcery
 endfunction
 
-function! s:my_theme_dict.badwolf() dict abort
-  if !utils#HasColorscheme('badwolf') | return | endif
-
-  let g:badwolf_darkgutter = 0
-  " Make the tab line lighter than the background.
-  let g:badwolf_tabline = 2
-  colorscheme badwolf
-endfunction
-
 function! s:my_theme_dict.deus() dict abort
   if !utils#HasColorscheme('deus') | return | endif
 
@@ -72,10 +57,9 @@ function! s:my_theme_dict.solarized8() dict abort
   colorscheme solarized8_high
 endfunction
 
-function! s:my_theme_dict.monokai_tasty() dict abort
-  if !utils#HasColorscheme('vim-monokai-tasty') | return | endif
-  let g:vim_monokai_tasty_italic = 1
-  colorscheme vim-monokai-tasty
+function! s:my_theme_dict.monokai() dict abort
+  if !utils#HasColorscheme('monokai') | return | endif
+  colorscheme monokai
 endfunction
 
 function! s:my_theme_dict.vim_one() dict abort
@@ -107,6 +91,11 @@ function! s:my_theme_dict.neodark() dict abort
   colorscheme neodark
 endfunction
 
+let s:candidate_theme = ['gruvbox8', 'srcery', 'deus', 'happy_hacking', 'solarized8',
+      \ 'monokai', 'vim_one', 'material', 'onedark']
+let s:idx = utils#RandInt(0, len(s:candidate_theme)-1)
+let s:theme = s:candidate_theme[s:idx]
+
 let s:colorscheme_func = printf('s:my_theme_dict.%s()', s:theme)
 if has_key(s:my_theme_dict, s:theme)
   execute 'call ' . s:colorscheme_func