diff --git a/colors/paper-tonic.lua b/colors/paper-tonic.lua
index 074a5b8..0cb2bd7 100644
--- a/colors/paper-tonic.lua
+++ b/colors/paper-tonic.lua
@@ -278,16 +278,16 @@ local highlight_groups = {
 	Float   = 'Number',
 
 	--[[ 4.1.2. Identifiers]]
-	Identifier = {fg=c_primary, style='bold'},
-	Function = {fg=c_primary},
+	Identifier = {fg=c_primary_weak, style='bold'},
+	Function = {fg=c_primary_strong, style='bold'},
 
 	--[[ 4.1.3. Syntax]]
-	Statement   = {fg=fg},
-	Conditional = {fg=fg, style='bold'},
+	Statement   = {fg=c_fg_weak},
+	Conditional = {fg=c_fg_strong, style='bold'},
 	Repeat   = 'Conditional',
 	Label    = {fg=c_fg_strongest, style='bold'},
-	Operator = {fg=fg_weak},
-	Keyword  = {fg=fg_strong, style='bold'},
+	Operator = {fg=c_fg, style='bold'},
+	Keyword  = {fg=c_fg_weakest, style='bold'},
 	Exception = {fg=c_fg_exception, style='bold'},
 	Noise = {fg=c_fg_weakest},
 
@@ -412,10 +412,10 @@ local highlight_groups = {
 	--[[ 4.2.12. Cursor ]]
 	Cursor   = {style='inverse'},
 	CursorIM = 'Cursor',
-	CursorColumn = {bg=c_fg_strong},
+	CursorColumn = {bg=c_bg_hl},
 
 	--[[ 4.2.13. Misc ]]
-	Directory = {fg=ice, style='bold'},
+	Directory = {fg=c_primary_weak, style='bold'},
 
 	--[[ 4.3. Programming Languages
 		Everything in this section is OPTIONAL. Feel free to remove everything
@@ -838,10 +838,12 @@ local highlight_groups = {
 	--[[ 4.4.8. nvim-treesitter ]]
 	TSConstBuiltin = 'Constant',
 	TSConstructor  = 'Typedef',
+	TSKeywordFunction  = {fg=c_fg_weak, style='bold'},
 	TSFuncBuiltin  = 'Function',
 	TSStringEscape = 'Character',
 	TSStringRegex  = 'SpecialChar',
 	TSURI = 'Tag',
+	TSVariable        = 'Identifier',
 	TSVariableBuiltin = 'Identifier',
 
 	--[[ 4.4.9. barbar.nvim ]]
@@ -974,20 +976,20 @@ local highlight_groups = {
 local terminal_colors = {
 	[1]  = c_bg,
 	[2]  = c_alert_strong,
-	[3]  = green_dark,
-	[4]  = orange,
-	[5]  = blue,
-	[6]  = magenta_dark,
-	[7]  = teal,
+	[3]  = c_2_strong,
+	[4]  = c_alert,
+	[5]  = c_3,
+	[6]  = c_5_strong,
+	[7]  = c_3_weak,
 	[8]  = c_fg,
 	[9]  = c_fg_strong,
 	[10] = c_alert,
-	[11] = green,
-	[12] = yellow,
-	[13] = turqoise,
-	[14] = purple,
-	[15] = cyan,
-	[16] = c_fg_weak
+	[11] = c_2,
+	[12] = c_alert_weak,
+	[13] = c_3,
+	[14] = c_5,
+	[15] = c_bg_hl_special_strong,
+	[16] = c_bg
 }
 
 --[[ Step 5: Sourcing