diff --git a/colors/paper-custom.erb b/colors/paper-custom.erb
index 484bc7e..91125e7 100644
--- a/colors/paper-custom.erb
+++ b/colors/paper-custom.erb
@@ -18,13 +18,21 @@
     fg                      = ["#8c8c8c", 243, "gray"]
     fg_strong               = ["#777777", 232, "gray"]
 
-    # color_primary_weak      = ["#76799d", 124, "red"]
-    # color_primary           = ["#5d5f7b", 88, "darkred"]
-    # color_primary_strong    = ["#444762", 52, "darkred"]
+    color_primary_weak      = ["#666666", 20, "blue"]
+    color_primary           = ["#555555", 19, "darkblue"]
+    color_primary_strong    = ["#444444", 17, "darkblue"]
 
-    color_primary_weak            = ["#e846ac", 164, "magenta"]
-    color_primary                 = ["#d70087", 164, "magenta"]
-    color_primary_strong          = ["#ad006d", 164, "magenta"]
+    # color_primary_weak      = ["#898fcb", 20, "blue"]
+    # color_primary           = ["#7e84c6", 19, "darkblue"]
+    # color_primary_strong    = ["#5c6191", 17, "darkblue"]
+
+    # color_primary_weak      = ["#9f61c2", 20, "blue"]
+    # color_primary           = ["#8132ad", 19, "darkblue"]
+    # color_primary_strong    = ["#641b8d", 17, "darkblue"]
+
+    # color_primary_weak      = ["#ff9800", 20, "blue"]
+    # color_primary           = ["#d68000", 19, "darkblue"]
+    # color_primary_strong    = ["#bc6200", 17, "darkblue"]
 
     color_2_weak            = ["#5e955e", 28, "darkgreen"]
     color_2                 = ["#008700", 22, "darkgreen"]
@@ -38,9 +46,9 @@
     color_4                 = ["#56acd7", 19, "blue"]
     color_4_strong          = ["#1596d7", 17, "darkblue"]
 
-    color_5_weak            = ["#898fcb", 20, "blue"]
-    color_5                 = ["#7e84c6", 19, "darkblue"]
-    color_5_strong          = ["#5c6191", 17, "darkblue"]
+    color_5_weak            = ["#e846ac", 164, "magenta"]
+    color_5                 = ["#d70087", 164, "magenta"]
+    color_5_strong          = ["#ad006d", 164, "magenta"]
 
     fg_error                = ["#d70000", 196, "red"]
     bg_error                = ["#ffd7d7", 196, "red"]
@@ -257,6 +265,10 @@
 
           [ "javaScript",             "Special" ],
           [ "javaScriptExpression",   "javaScript" ],
+
+          [ "jsxTagName",             "htmlTagName" ],
+          [ "jsxBraces",              "Special" ],
+
           [ "htmlCssStyleComment",    "Comment" ],
           [ "htmlCssDefinition",      "Special" ],
 
diff --git a/colors/paper-custom.vim b/colors/paper-custom.vim
index 3612964..f72de84 100644
--- a/colors/paper-custom.vim
+++ b/colors/paper-custom.vim
@@ -22,15 +22,15 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
     hi GitGutterChangeDelete ctermbg=NONE ctermfg=126 cterm=bold guibg=NONE guifg=#5c4a5a gui=bold
     hi Normal ctermbg=234 ctermfg=243 cterm=NONE guibg=#ffffff guifg=#8c8c8c gui=NONE
     set background=light
-    hi Special ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#ad006d gui=bold
+    hi Special ctermbg=NONE ctermfg=17 cterm=bold guibg=NONE guifg=#444444 gui=bold
     hi SpecialKey ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#bbbbbb gui=NONE
     hi NonText ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#bbbbbb gui=NONE
     hi Noise ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#bbbbbb gui=NONE
-    hi Tag ctermbg=164 ctermfg=NONE cterm=NONE guibg=#e846ac guifg=NONE gui=NONE
-    hi Identifier ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#d70087 gui=bold
-    hi Function ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#d70087 gui=NONE
-    hi Type ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#e846ac gui=bold
-    hi StorageClass ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#e846ac gui=NONE
+    hi Tag ctermbg=20 ctermfg=NONE cterm=NONE guibg=#666666 guifg=NONE gui=NONE
+    hi Identifier ctermbg=NONE ctermfg=19 cterm=bold guibg=NONE guifg=#555555 gui=bold
+    hi Function ctermbg=NONE ctermfg=19 cterm=NONE guibg=NONE guifg=#555555 gui=NONE
+    hi Type ctermbg=NONE ctermfg=20 cterm=bold guibg=NONE guifg=#666666 gui=bold
+    hi StorageClass ctermbg=NONE ctermfg=20 cterm=NONE guibg=NONE guifg=#666666 gui=NONE
     hi link Structure StorageClass
     hi link TypeDef StorageClass
     hi Constant ctermbg=NONE ctermfg=232 cterm=italic guibg=NONE guifg=#777777 gui=italic
@@ -46,7 +46,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
     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
-    hi Exception ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#e846ac gui=bold
+    hi Exception ctermbg=NONE ctermfg=20 cterm=bold guibg=NONE guifg=#666666 gui=bold
     hi PreProc ctermbg=NONE ctermfg=238 cterm=bold guibg=NONE guifg=#9d9d9d gui=bold
     hi Include ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#9d9d9d gui=NONE
     hi Comment ctermbg=NONE ctermfg=238 cterm=bold,italic guibg=NONE guifg=#9d9d9d gui=bold,italic
@@ -161,6 +161,8 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
     hi link htmlError Error
     hi link javaScript Special
     hi link javaScriptExpression javaScript
+    hi link jsxTagName htmlTagName
+    hi link jsxBraces Special
     hi link htmlCssStyleComment Comment
     hi link htmlCssDefinition Special
     hi link htmlImgArg htmlArg
@@ -224,12 +226,12 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
     hi pythonSelf ctermbg=NONE ctermfg=238 cterm=bold guibg=NONE guifg=#9d9d9d gui=bold
     hi link JinjaVarBlock Noise
     hi link JinjaTagBlock JinjaVarBlock
-    hi jinjaSpecial ctermbg=NONE ctermfg=17 cterm=bold guibg=NONE guifg=#5c6191 gui=bold
-    hi jinjaRaw ctermbg=NONE ctermfg=17 cterm=NONE guibg=NONE guifg=#5c6191 gui=NONE
-    hi jinjaStatement ctermbg=NONE ctermfg=19 cterm=NONE guibg=NONE guifg=#7e84c6 gui=NONE
-    hi jinjaFilter ctermbg=NONE ctermfg=20 cterm=NONE guibg=NONE guifg=#898fcb gui=NONE
-    hi jinjaBlockName ctermbg=NONE ctermfg=20 cterm=NONE guibg=NONE guifg=#898fcb gui=NONE
-    hi jinjaVariable ctermbg=NONE ctermfg=19 cterm=NONE guibg=NONE guifg=#7e84c6 gui=NONE
+    hi jinjaSpecial ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#ad006d gui=bold
+    hi jinjaRaw ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#ad006d gui=NONE
+    hi jinjaStatement ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#d70087 gui=NONE
+    hi jinjaFilter ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#e846ac gui=NONE
+    hi jinjaBlockName ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#e846ac gui=NONE
+    hi jinjaVariable ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#d70087 gui=NONE
     hi link jinjaString String
     hi link jinjaNumber Number
     hi link jinjaOperator Noise
@@ -340,15 +342,15 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
     hi GitGutterChangeDelete ctermbg=NONE ctermfg=magenta cterm=bold
     hi Normal ctermbg=black ctermfg=gray cterm=NONE
     set background=light
-    hi Special ctermbg=NONE ctermfg=magenta cterm=bold
+    hi Special ctermbg=NONE ctermfg=darkblue cterm=bold
     hi SpecialKey ctermbg=NONE ctermfg=gray cterm=NONE
     hi NonText ctermbg=NONE ctermfg=gray cterm=NONE
     hi Noise ctermbg=NONE ctermfg=gray cterm=NONE
-    hi Tag ctermbg=magenta ctermfg=NONE cterm=NONE
-    hi Identifier ctermbg=NONE ctermfg=magenta cterm=bold
-    hi Function ctermbg=NONE ctermfg=magenta cterm=NONE
-    hi Type ctermbg=NONE ctermfg=magenta cterm=bold
-    hi StorageClass ctermbg=NONE ctermfg=magenta cterm=NONE
+    hi Tag ctermbg=blue ctermfg=NONE cterm=NONE
+    hi Identifier ctermbg=NONE ctermfg=darkblue cterm=bold
+    hi Function ctermbg=NONE ctermfg=darkblue cterm=NONE
+    hi Type ctermbg=NONE ctermfg=blue cterm=bold
+    hi StorageClass ctermbg=NONE ctermfg=blue cterm=NONE
     hi link Structure StorageClass
     hi link TypeDef StorageClass
     hi Constant ctermbg=NONE ctermfg=gray cterm=italic
@@ -364,7 +366,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
     hi Label ctermbg=NONE ctermfg=gray cterm=bold
     hi Operator ctermbg=NONE ctermfg=gray cterm=NONE
     hi Keyword ctermbg=NONE ctermfg=gray cterm=NONE
-    hi Exception ctermbg=NONE ctermfg=magenta cterm=bold
+    hi Exception ctermbg=NONE ctermfg=blue cterm=bold
     hi PreProc ctermbg=NONE ctermfg=gray cterm=bold
     hi Include ctermbg=NONE ctermfg=gray cterm=NONE
     hi Comment ctermbg=NONE ctermfg=gray cterm=bold,italic
@@ -479,6 +481,8 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
     hi link htmlError Error
     hi link javaScript Special
     hi link javaScriptExpression javaScript
+    hi link jsxTagName htmlTagName
+    hi link jsxBraces Special
     hi link htmlCssStyleComment Comment
     hi link htmlCssDefinition Special
     hi link htmlImgArg htmlArg
@@ -542,12 +546,12 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
     hi pythonSelf ctermbg=NONE ctermfg=gray cterm=bold
     hi link JinjaVarBlock Noise
     hi link JinjaTagBlock JinjaVarBlock
-    hi jinjaSpecial ctermbg=NONE ctermfg=darkblue cterm=bold
-    hi jinjaRaw ctermbg=NONE ctermfg=darkblue cterm=NONE
-    hi jinjaStatement ctermbg=NONE ctermfg=darkblue cterm=NONE
-    hi jinjaFilter ctermbg=NONE ctermfg=blue cterm=NONE
-    hi jinjaBlockName ctermbg=NONE ctermfg=blue cterm=NONE
-    hi jinjaVariable ctermbg=NONE ctermfg=darkblue cterm=NONE
+    hi jinjaSpecial ctermbg=NONE ctermfg=magenta cterm=bold
+    hi jinjaRaw ctermbg=NONE ctermfg=magenta cterm=NONE
+    hi jinjaStatement ctermbg=NONE ctermfg=magenta cterm=NONE
+    hi jinjaFilter ctermbg=NONE ctermfg=magenta cterm=NONE
+    hi jinjaBlockName ctermbg=NONE ctermfg=magenta cterm=NONE
+    hi jinjaVariable ctermbg=NONE ctermfg=magenta cterm=NONE
     hi link jinjaString String
     hi link jinjaNumber Number
     hi link jinjaOperator Noise