diff --git a/src/Languages/Python/Patterns/PyBooleanPattern.php b/src/Languages/Python/Patterns/PyBooleanPattern.php
index dd7f83d..e42d3af 100644
--- a/src/Languages/Python/Patterns/PyBooleanPattern.php
+++ b/src/Languages/Python/Patterns/PyBooleanPattern.php
@@ -19,6 +19,6 @@ public function getPattern(): string
 
     public function getTokenType(): TokenTypeEnum
     {
-        return TokenTypeEnum::TYPE;
+        return TokenTypeEnum::BOOLEAN;
     }
 }
diff --git a/src/Languages/Python/Patterns/PyNumberPattern.php b/src/Languages/Python/Patterns/PyNumberPattern.php
new file mode 100644
index 0000000..b8e14aa
--- /dev/null
+++ b/src/Languages/Python/Patterns/PyNumberPattern.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tempest\Highlight\Languages\Python\Patterns;
+
+use Tempest\Highlight\IsPattern;
+use Tempest\Highlight\Pattern;
+use Tempest\Highlight\Tokens\TokenTypeEnum;
+
+final readonly class PyNumberPattern implements Pattern
+{
+    use IsPattern;
+
+    public function getPattern(): string
+    {
+        return '(?<match>\b0(?:[bB](?:_?[01])+|[oO](?:_?[0-7])+|[xX](?:_?[a-fA-F0-9])+)\b|(?:\b\d+(?:_\d+)*(?:\.(?:\d+(?:_\d+)*)?)?|\B\.\d+(?:_\d+)*)(?:[eE][+-]?\d+(?:_\d+)*)?j?(?!\w))';
+    }
+
+    public function getTokenType(): TokenTypeEnum
+    {
+        return TokenTypeEnum::NUMBER;
+    }
+}
diff --git a/src/Languages/Python/PythonLanguage.php b/src/Languages/Python/PythonLanguage.php
index 6d13f1b..9b0ced0 100644
--- a/src/Languages/Python/PythonLanguage.php
+++ b/src/Languages/Python/PythonLanguage.php
@@ -15,6 +15,7 @@
 use Tempest\Highlight\Languages\Python\Patterns\PyDecoratorPattern;
 use Tempest\Highlight\Languages\Python\Patterns\PyFunctionPattern;
 use Tempest\Highlight\Languages\Python\Patterns\PyKeywordPattern;
+use Tempest\Highlight\Languages\Python\Patterns\PyNumberPattern;
 use Tempest\Highlight\Languages\Python\Patterns\PyOperatorPattern;
 use Tempest\Highlight\Languages\Python\Patterns\PyTripleDoubleQuoteStringPattern;
 use Tempest\Highlight\Languages\Python\Patterns\PyTripleSingleQuoteStringPattern;
@@ -52,12 +53,17 @@ public function getPatterns(): array
             new PyFunctionPattern(),
 
             // TYPES
-            new PyBooleanPattern(),
             new PyBuiltinPattern(),
 
             // COMMENTS
             new PyCommentPattern(),
 
+            // NUMBERS
+            new PyNumberPattern(),
+
+            // BOOLEANS
+            new PyBooleanPattern(),
+
             // OPERATORS
             new PyOperatorPattern(),
 
diff --git a/tests/Languages/Python/PythonLanguageTest.php b/tests/Languages/Python/PythonLanguageTest.php
index 61ceda5..41b1249 100644
--- a/tests/Languages/Python/PythonLanguageTest.php
+++ b/tests/Languages/Python/PythonLanguageTest.php
@@ -44,14 +44,14 @@ public static function data(): array
             <<<TXT
 <span class="hl-keyword">def</span> <span class="hl-property">fib</span>(n):    <span class="hl-comment"># write Fibonacci series up to n</span>
     <span class="hl-value">&quot;&quot;&quot;Print a Fibonacci series up to n.&quot;&quot;&quot;</span>
-    a, b <span class="hl-operator">=</span> 0, 1
+    a, b <span class="hl-operator">=</span> <span class="hl-number">0<span>, <span class="hl-number">1</span>
     <span class="hl-keyword">while</span> a <span class="hl-operator">&lt;</span> n:
         <span class="hl-type">print</span>(a, <span class="hl-variable">end</span><span class="hl-operator">=</span>'<span class="hl-value"> </span>')
         a, b <span class="hl-operator">=</span> b, a<span class="hl-operator">+</span>b
     <span class="hl-type">print</span>()
 
 <span class="hl-comment"># Now call the function we just defined:</span>
-fib(2000)
+fib(<span class="hl-number">2000</span>)
 TXT],
         ];
     }