diff --git a/colors/paper-tonic.lua b/colors/paper-tonic.lua
index d705eb6..074a5b8 100644
--- a/colors/paper-tonic.lua
+++ b/colors/paper-tonic.lua
@@ -89,13 +89,13 @@ local c_bg_ui    = {'#efefef', 0,     'darkgray'}
 local c_bg_error      = {'#ffd7d7', 196,   'white'}
 local c_bg_error_weak = {'#ffefef', 196,   'white'}
 
-local c_add =    {'#89af89', 196,   'white'}
-local c_change = {'#8989af', 196,   'white'}
-local c_delete = {'#af8989', 196,   'white'}
+local c_success =    {'#89af89', 196,   'white'}
+local c_modified = {'#8989af', 196,   'white'}
+local c_fail = {'#af8989', 196,   'white'}
 
-local c_bg_diff_add = {'#e0ece0', 196,   'white'}
-local c_bg_diff_change = {'#e0e0ec', 196,   'white'}
-local c_bg_diff_delete = {'#ece0e0', 196,   'white'}
+local c_bg_success = {'#e0ece0', 196,   'white'}
+local c_bg_modified = {'#e0e0ec', 196,   'white'}
+local c_bg_fail = {'#ece0e0', 196,   'white'}
 
 local c_bg_hl_strong   = {"#dddddd", 17, "white"}
 local c_bg_hl          = {"#eeeeee", 250, "white"}
@@ -359,10 +359,10 @@ local highlight_groups = {
 	Folded = {fg=c_fg_strong, style='bold'},
 
 	--[[ 4.2.6. Diffs]]
-	DiffAdd    = {bg=c_bg_diff_add},
-	DiffChange = {bg=c_bg_diff_change},
-	DiffDelete = {bg=c_bg_diff_delete},
-	DiffText   = {fg=c_fg_strongest, bg=c_bg_diff_add},
+	DiffAdd    = {bg=c_bg_success},
+	DiffChange = {bg=c_bg_modified},
+	DiffDelete = {bg=c_bg_fail},
+	DiffText   = {fg=c_fg_strongest, bg=c_bg_success},
 
 	--[[ 4.2.7. Searching]]
 	IncSearch  = {style='inverse'},
@@ -798,9 +798,9 @@ local highlight_groups = {
 
 	--[[ 4.4.2. coc.nvim ]]
 	CocErrorHighlight = {style={'undercurl', color=c_alert}},
-	CocHintHighlight  = {style={'undercurl', color=magenta}},
+	CocHintHighlight  = {style={'undercurl', color=c_primary_strong}},
 	CocInfoHighlight  = {style={'undercurl', color=pink_light}},
-	CocWarningHighlight = {style={'undercurl', color=orange}},
+	CocWarningHighlight = {style={'undercurl', color=c_primary_strong}},
 	CocErrorSign = 'ALEErrorSign',
 	CocHintSign  = 'HintMsg',
 	CocInfoSign  = 'InfoMsg',
@@ -811,10 +811,10 @@ local highlight_groups = {
 	JumpMotion = 'EasyMotion',
 
 	--[[ 4.4.4. vim-gitgutter / vim-signify ]]
-	GitGutterAdd    = {fg=c_add},
-	GitGutterChange = {fg=c_change},
-	GitGutterDelete = {fg=c_delete},
-	GitGutterChangeDelete = {fg=c_change},
+	GitGutterAdd    = {fg=c_success},
+	GitGutterChange = {fg=c_modified},
+	GitGutterDelete = {fg=c_fail},
+	GitGutterChangeDelete = {fg=c_modified},
 
 	SignifySignAdd    = 'GitGutterAdd',
 	SignifySignChange = 'GitGutterChange',
@@ -847,7 +847,7 @@ local highlight_groups = {
 	--[[ 4.4.9. barbar.nvim ]]
 	BufferCurrent       = 'TabLineSel',
 	BufferCurrentIndex  = function(self) return {fg=self.InfoMsg.fg, bg=self.BufferCurrent.bg} end,
-	BufferCurrentMod    = {fg=c_change, bg=c_bg, style='bold'},
+	BufferCurrentMod    = {fg=c_modified, bg=c_bg, style='bold'},
 	BufferCurrentSign   = 'HintMsg',
 	BufferCurrentTarget = 'BufferCurrentSign',
 
@@ -926,7 +926,7 @@ local highlight_groups = {
 	packerPackageNotLoaded = 'Ignore',
 	packerStatusFail = 'Statement',
 	packerStatusSuccess = 'packerStatusFail',
-	packerSuccess = function(self) return {fg=c_add, style=self.packerFail.style} end,
+	packerSuccess = function(self) return {fg=c_success, style=self.packerFail.style} end,
 
 	-- [[ 5.0.1 custom ]]
 	TabLineFill = { fg=ui_bg, fg=ui_bg, style='italic' },