diff --git a/syntaxes/nushell.tmLanguage.json b/syntaxes/nushell.tmLanguage.json
index 8f855c0..85ed575 100644
--- a/syntaxes/nushell.tmLanguage.json
+++ b/syntaxes/nushell.tmLanguage.json
@@ -163,11 +163,19 @@
       "name": "constant.numeric.nushell"
     },
     "numbers-hexa": {
-      "match": "(?<![\\w-])0x[0-9a-fA-F]+(?![\\w.])",
+      "match": "(?<![\\w-])_*+0_*+x_*+[0-9a-fA-F][0-9a-fA-F_]*+(?![\\w.])",
+      "name": "constant.numeric.nushell"
+    },
+    "numbers-octal": {
+      "match": "(?<![\\w-])_*+0_*+o_*+[0-7][0-7_]*+(?![\\w.])",
+      "name": "constant.numeric.nushell"
+    },
+    "numbers-binary": {
+      "match": "(?<![\\w-])_*+0_*+b_*+[01][01_]*+(?![\\w.])",
       "name": "constant.numeric.nushell"
     },
     "numbers": {
-      "match": "(?<![\\w-])[-+]?(?:\\d+|\\d{1,3}(?:_\\d{3})*)(?:\\.\\d*)?(?i:ns|us|µs|ms|sec|min|hr|day|wk|b|kb|mb|gb|tb|pt|eb|zb|kib|mib|gib|tib|pit|eib|zib)?(?:(?![\\w.])|(?=\\.\\.))",
+      "match": "(?<![\\w-])_*+[-+]?_*+(?:(?i:NaN|infinity|inf)_*+|(?:\\d[\\d_]*+\\.?|\\._*+\\d)[\\d_]*+(?i:E_*+[-+]?_*+\\d[\\d_]*+)?)(?i:ns|us|µs|ms|sec|min|hr|day|wk|b|kb|mb|gb|tb|pt|eb|zb|kib|mib|gib|tib|pit|eib|zib)?(?:(?![\\w.])|(?=\\.\\.))",
       "name": "constant.numeric.nushell"
     },
     "binary": {
@@ -195,6 +203,8 @@
         { "include": "#datetime" },
         { "include": "#numbers" },
         { "include": "#numbers-hexa" },
+        { "include": "#numbers-octal" },
+        { "include": "#numbers-binary" },
         { "include": "#binary" }
       ]
     },