diff --git a/colors/zenbones.vim b/colors/zenbones.vim
index 1d9b2e8..c5ad1e7 100644
--- a/colors/zenbones.vim
+++ b/colors/zenbones.vim
@@ -202,10 +202,14 @@ highlight! link SignColumn LineNr
 highlight! link Sneak Search
 highlight! link SneakLabel WildMenu
 highlight! link SpellLocal SpellCap
+highlight! link TSConstBuiltin Number
+highlight! link TSConstMacro Number
 highlight! link TSDanger Error
+highlight! link TSNamespace Special
 highlight! link TSNote LspDiagnosticsDefaultInformation
 highlight! link TSTag Special
 highlight! link TSVariable Identifier
+highlight! link TSVariableBuiltin Number
 highlight! link TSWarning WarningMsg
 highlight! link TabLineFill StatusLineNC
 highlight! link TelescopeBorder FloatBorder
diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim
index 33307d9..f669ce3 100644
--- a/colors/zenflesh.vim
+++ b/colors/zenflesh.vim
@@ -202,10 +202,14 @@ highlight! link SignColumn LineNr
 highlight! link Sneak Search
 highlight! link SneakLabel WildMenu
 highlight! link SpellLocal SpellCap
+highlight! link TSConstBuiltin Number
+highlight! link TSConstMacro Number
 highlight! link TSDanger Error
+highlight! link TSNamespace Special
 highlight! link TSNote LspDiagnosticsDefaultInformation
 highlight! link TSTag Special
 highlight! link TSVariable Identifier
+highlight! link TSVariableBuiltin Number
 highlight! link TSWarning WarningMsg
 highlight! link TabLineFill StatusLineNC
 highlight! link TelescopeBorder FloatBorder
diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua
index 199fd55..0f3f5e2 100644
--- a/lua/zenbones/init.lua
+++ b/lua/zenbones/init.lua
@@ -220,21 +220,21 @@ local theme = lush(function()
 		-- TSConstructor        { };	-- For constructor calls and definitions: ` { }` in Lua, and Java constructors.
 		-- TSConditional        { };	-- For keywords related to conditionnals.
 		-- TSConstant           { };	-- For constants
-		-- TSConstBuiltin       { };	-- For constant that are built in the language: `nil` in Lua.
-		-- TSConstMacro         { };	-- For constants that are defined by macros: `NULL` in C.
+		TSConstBuiltin          { Number };	-- For constant that are built in the language: `nil` in Lua.
+		TSConstMacro            { Number };	-- For constants that are defined by macros: `NULL` in C.
 		-- TSError              { };	-- For syntax/parser errors.
 		-- TSException          { };	-- For exception related keywords.
 		-- TSField              { };	-- For fields.
 		-- TSFloat              { };	-- For floats.
 		-- TSFunction           { };	-- For function (calls and definitions).
-		-- TSFuncBuiltin        { };	-- For builtin functions: `table.insert` in Lua.
+		-- TSFuncBuiltin        { };	-- For builtin functions: `print` in Lua.
 		-- TSFuncMacro          { };	-- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust.
 		-- TSInclude            { };	-- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua.
 		-- TSKeyword            { };	-- For keywords that don't fall in previous categories.
 		-- TSKeywordFunction    { };	-- For keywords used to define a fuction.
 		-- TSLabel              { };	-- For labels: `label:` in C and `:label:` in Lua.
 		-- TSMethod             { };	-- For method calls and definitions.
-		-- TSNamespace          { };	-- For identifiers referring to modules and namespaces.
+		TSNamespace             { Special };	-- For identifiers referring to modules and namespaces.
 		-- TSNone               { };	-- TODO: docs
 		-- TSNumber             { };	-- For all numbers
 		-- TSOperator           { };	-- For any operator: `+`, but also `->` and `*` in C.
@@ -252,7 +252,7 @@ local theme = lush(function()
 		-- TSType               { };	-- For types.
 		-- TSTypeBuiltin        { };	-- For builtin types.
 		TSVariable              { Identifier }, -- Any variable name that does not have another highlight.
-		-- TSVariableBuiltin    { };	-- Variable names that are defined by the languages, like `this` or `self`.
+		TSVariableBuiltin       { Number };	-- Variable names that are defined by the languages, like `this` or `self`.
 
 		TSTag                   { Special }, -- Tags like html tag names.
 		-- TSTagDelimiter       { };	-- Tag delimiter like `<` `>` `/`
diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua
index 8482eac..1af62f8 100644
--- a/lua/zenflesh/init.lua
+++ b/lua/zenflesh/init.lua
@@ -220,21 +220,21 @@ local theme = lush(function()
 		-- TSConstructor        { };	-- For constructor calls and definitions: ` { }` in Lua, and Java constructors.
 		-- TSConditional        { };	-- For keywords related to conditionnals.
 		-- TSConstant           { };	-- For constants
-		-- TSConstBuiltin       { };	-- For constant that are built in the language: `nil` in Lua.
-		-- TSConstMacro         { };	-- For constants that are defined by macros: `NULL` in C.
+		TSConstBuiltin          { Number };	-- For constant that are built in the language: `nil` in Lua.
+		TSConstMacro            { Number };	-- For constants that are defined by macros: `NULL` in C.
 		-- TSError              { };	-- For syntax/parser errors.
 		-- TSException          { };	-- For exception related keywords.
 		-- TSField              { };	-- For fields.
 		-- TSFloat              { };	-- For floats.
 		-- TSFunction           { };	-- For function (calls and definitions).
-		-- TSFuncBuiltin        { };	-- For builtin functions: `table.insert` in Lua.
+		-- TSFuncBuiltin        { };	-- For builtin functions: `print` in Lua.
 		-- TSFuncMacro          { };	-- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust.
 		-- TSInclude            { };	-- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua.
 		-- TSKeyword            { };	-- For keywords that don't fall in previous categories.
 		-- TSKeywordFunction    { };	-- For keywords used to define a fuction.
 		-- TSLabel              { };	-- For labels: `label:` in C and `:label:` in Lua.
 		-- TSMethod             { };	-- For method calls and definitions.
-		-- TSNamespace          { };	-- For identifiers referring to modules and namespaces.
+		TSNamespace             { Special };	-- For identifiers referring to modules and namespaces.
 		-- TSNone               { };	-- TODO: docs
 		-- TSNumber             { };	-- For all numbers
 		-- TSOperator           { };	-- For any operator: `+`, but also `->` and `*` in C.
@@ -252,7 +252,7 @@ local theme = lush(function()
 		-- TSType               { };	-- For types.
 		-- TSTypeBuiltin        { };	-- For builtin types.
 		TSVariable              { Identifier }, -- Any variable name that does not have another highlight.
-		-- TSVariableBuiltin    { };	-- Variable names that are defined by the languages, like `this` or `self`.
+		TSVariableBuiltin       { Number };	-- Variable names that are defined by the languages, like `this` or `self`.
 
 		TSTag                   { Special }, -- Tags like html tag names.
 		-- TSTagDelimiter       { };	-- Tag delimiter like `<` `>` `/`