diff --git a/plugin/nim.vim b/plugin/nim.vim
index a5edfbf..595e065 100644
--- a/plugin/nim.vim
+++ b/plugin/nim.vim
@@ -35,7 +35,7 @@ let g:nvim_nim_exec_bash       = CheckDependency("bash")
 let g:nvim_nim_deps_nim        = FindNimModulesPath()
 let g:nvim_nim_deps_nimble     = FindNimbleModulesPath()
 
-let g:nvim_nim_highlighter_enable     = 1
+let g:nvim_nim_highlighter_enable     = 0
 let g:nvim_nim_enable_async           = 1
 let g:nvim_nim_highlight_builtin      = 1
 let g:nvim_nim_highlight_use_unite    = 0
diff --git a/syntax/nim.vim b/syntax/nim.vim
index 3b45b4e..286af61 100644
--- a/syntax/nim.vim
+++ b/syntax/nim.vim
@@ -84,11 +84,14 @@ syntax keyword nimGlobals on off appType NoFakeVars isMainModule CompileDate Com
 
 
 " Numbers
-syntax match nimNumber "\v[0-9_]+((i|I|u|U)(8|16|32|64))?>"
-syntax match nimFloat "\v[0-9_]+(f|d|F|D)>"
-syntax match nimFloat "\v[0-9_]+\.[0-9]+(f|d|F|D)>"
-syntax match nimFloat "\v[0-9_]+((f|F)(32|64|128))>"
-syntax match nimFloat "\v[0-9_]+\.[0-9]+((f|F)(32|64|128))?>"
+syntax match nimNumber "\v<[0-9_]+((i|I|u|U)(8|16|32|64))?>"
+syntax match nimNumber "\v<0x[0-9,a-f,A-F]+>"
+syntax match nimNumber "\v<0[bB][01]+>"
+syntax match nimNumber "\v<0[ocC][0-7]+>"
+syntax match nimFloat "\v<[0-9_]+(f|d|F|D)>"
+syntax match nimFloat "\v<[0-9_]+\.[0-9]+(f|d|F|D)>"
+syntax match nimFloat "\v<[0-9_]+((f|F)(32|64|128))>"
+syntax match nimFloat "\v<[0-9_]+\.[0-9]+((f|F)(32|64|128))?>"
 
 
 " Tokens