diff --git a/colors/paper-custom.erb b/colors/paper-custom.erb
index 7c5e3ca..dec57b5 100644
--- a/colors/paper-custom.erb
+++ b/colors/paper-custom.erb
@@ -104,8 +104,8 @@
           [ "Folded", "NONE", fg_strong, "bold" ],
 
           [ "Statement", "NONE", fg, "NONE" ],
-          [ "Conditional", "NONE", fg_strong, "NONE" ],
-          [ "Repeat", "NONE", fg_strong, "NONE" ],
+          [ "Conditional", "NONE", fg, "bold" ],
+          [ "Repeat", "Conditional" ],
           [ "Label", "NONE", fg_strong, "bold" ],
           [ "Operator", "NONE", fg_weak, "NONE" ],
           [ "Keyword", "NONE", fg_strong, "NONE" ],
@@ -297,8 +297,7 @@
 
           # javascript
           [ "jsFunctionKey",       "Function" ],
-          [ "jsFuncCall",          "Function" ],
-          [ "jsFuncCall",          "Identifier" ],
+          [ "jsFuncCall",          "Keyword" ],
           [ "jsOperator",          "Operator" ],
           [ "jsVariableDef",       "Identifier" ],
           [ "jsGlobalObjects",     "Keyqord" ],
diff --git a/colors/paper-custom.vim b/colors/paper-custom.vim
index 0df2a60..9d16c03 100644
--- a/colors/paper-custom.vim
+++ b/colors/paper-custom.vim
@@ -41,8 +41,8 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
     hi link Float String
     hi Folded ctermbg=NONE ctermfg=232 cterm=bold guibg=NONE guifg=#777777 gui=bold
     hi Statement ctermbg=NONE ctermfg=243 cterm=NONE guibg=NONE guifg=#8c8c8c gui=NONE
-    hi Conditional ctermbg=NONE ctermfg=232 cterm=NONE guibg=NONE guifg=#777777 gui=NONE
-    hi Repeat ctermbg=NONE ctermfg=232 cterm=NONE guibg=NONE guifg=#777777 gui=NONE
+    hi Conditional ctermbg=NONE ctermfg=243 cterm=bold guibg=NONE guifg=#8c8c8c gui=bold
+    hi link Repeat Conditional
     hi Label ctermbg=NONE ctermfg=232 cterm=bold guibg=NONE guifg=#777777 gui=bold
     hi Operator ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#9d9d9d gui=NONE
     hi Keyword ctermbg=NONE ctermfg=232 cterm=NONE guibg=NONE guifg=#777777 gui=NONE
@@ -194,8 +194,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
     hi link vueDirectiveClass Noise
     hi link vueMustache Type
     hi link jsFunctionKey Function
-    hi link jsFuncCall Function
-    hi link jsFuncCall Identifier
+    hi link jsFuncCall Keyword
     hi link jsOperator Operator
     hi link jsVariableDef Identifier
     hi link jsGlobalObjects Keyqord
@@ -357,8 +356,8 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
     hi link Float String
     hi Folded ctermbg=NONE ctermfg=gray cterm=bold
     hi Statement ctermbg=NONE ctermfg=gray cterm=NONE
-    hi Conditional ctermbg=NONE ctermfg=gray cterm=NONE
-    hi Repeat ctermbg=NONE ctermfg=gray cterm=NONE
+    hi Conditional ctermbg=NONE ctermfg=gray cterm=bold
+    hi link Repeat Conditional
     hi Label ctermbg=NONE ctermfg=gray cterm=bold
     hi Operator ctermbg=NONE ctermfg=gray cterm=NONE
     hi Keyword ctermbg=NONE ctermfg=gray cterm=NONE
@@ -510,8 +509,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
     hi link vueDirectiveClass Noise
     hi link vueMustache Type
     hi link jsFunctionKey Function
-    hi link jsFuncCall Function
-    hi link jsFuncCall Identifier
+    hi link jsFuncCall Keyword
     hi link jsOperator Operator
     hi link jsVariableDef Identifier
     hi link jsGlobalObjects Keyqord