diff --git a/autotests/folding/test.py.fold b/autotests/folding/test.py.fold
--- a/autotests/folding/test.py.fold
+++ b/autotests/folding/test.py.fold
@@ -48,3 +48,35 @@
 "Escapes in Doc/Comment String \u1234 \xAb \"\\"
 <beginfold id='4'>'''</beginfold id='4'> Doc/Comment String \N{123} \'<endfold id='4'>'''</endfold id='4'>
 <beginfold id='5'>"""</beginfold id='5'> Doc/Comment String \17 \x1f \n \" \\<endfold id='5'>"""</endfold id='5'>
+
+# Decimal, Hex, Binary, Octal
+a = 1_2_34L
+b = 0_0_00_0
+c = 0xA_3f_43D
+d = 0b0_0_1_01
+e = 0o71_2_34
+# Float
+d = 1.1E+3
+e = 1.E+3
+f = .1E+3
+g = 1E+3
+h = 1.1
+i = 1.
+j = .1
+k =  1
+l = 1_0.e+3_22 + .2_1e2 + 11_1.
+# Complex
+m = 1.1E+3j
+n = 1.E+3j
+o = .1E+3j
+p = 1E+3j
+q = 1.1j
+r = 1.j
+s = .1j
+t =  1j
+u = 1_0.e+3_22j + .2_1e2j + 11_1.j
+
+# Invalid numbers
+aaa.123
+aaa123
+.0x123
diff --git a/autotests/html/test.py.html b/autotests/html/test.py.html
--- a/autotests/html/test.py.html
+++ b/autotests/html/test.py.html
@@ -14,9 +14,9 @@
 // alert check, no word delimiter check at start of word, bug <span style="color:#b08000;">397719</span>
 <span style="color:#898887;">#</span><span style="color:#ca9219;background-color:#451e1a;font-weight:bold;">TODO</span>
 
-a =<span style="color:#b08000;"> 100_000</span>
-b =<span style="color:#b08000;"> 856_264</span>.<span style="color:#b08000;">65</span>
-c =<span style="color:#b08000;"> 0x420_F52</span>
+a = <span style="color:#b08000;">100_000</span>
+b = <span style="color:#b08000;">856_264.65</span>
+c = <span style="color:#b08000;">0x420_F52</span>
 
 <span style="font-weight:bold;">def</span> func(x):
     <span style="color:#898887;">&quot;&quot;&quot; EXTENDED API docs &quot;&quot;&quot;</span>
@@ -29,7 +29,7 @@
             }
         a1 = []
         a2 = [
-            <span style="color:#bf0303;">&quot;a&quot;</span>, <span style="color:#b08000;">032</span>, (
+            <span style="color:#bf0303;">&quot;a&quot;</span>, 032, (
                 )]
     <span style="font-weight:bold;">else</span>:
         <span style="color:#644a9b;font-weight:bold;">print</span>(<span style="color:#bf0303;">&quot;&quot;&quot;multi</span>
@@ -54,4 +54,36 @@
 <span style="color:#898887;">&quot;Escapes in Doc/Comment String </span><span style="color:#924c9d;">\u1234</span><span style="color:#898887;"> </span><span style="color:#924c9d;">\xAb</span><span style="color:#898887;"> </span><span style="color:#924c9d;">\&quot;\\</span><span style="color:#898887;">&quot;</span>
 <span style="color:#898887;">''' Doc/Comment String </span><span style="color:#924c9d;">\N{123}</span><span style="color:#898887;"> </span><span style="color:#924c9d;">\'</span><span style="color:#898887;">'''</span>
 <span style="color:#898887;">&quot;&quot;&quot; Doc/Comment String </span><span style="color:#924c9d;">\17</span><span style="color:#898887;"> </span><span style="color:#924c9d;">\x1f</span><span style="color:#898887;"> </span><span style="color:#924c9d;">\n</span><span style="color:#898887;"> </span><span style="color:#924c9d;">\&quot;</span><span style="color:#898887;"> </span><span style="color:#924c9d;">\\</span><span style="color:#898887;">&quot;&quot;&quot;</span>
+
+<span style="color:#898887;"># Decimal, Hex, Binary, Octal</span>
+a = <span style="color:#b08000;">1_2_34L</span>
+b = <span style="color:#b08000;">0_0_00_0</span>
+c = <span style="color:#b08000;">0xA_3f_43D</span>
+d = <span style="color:#b08000;">0b0_0_1_01</span>
+e = <span style="color:#b08000;">0o71_2_34</span>
+<span style="color:#898887;"># Float</span>
+d = <span style="color:#b08000;">1.1E+3</span>
+e = <span style="color:#b08000;">1.E+3</span>
+f = <span style="color:#b08000;">.1E+3</span>
+g = <span style="color:#b08000;">1E+3</span>
+h = <span style="color:#b08000;">1.1</span>
+i = <span style="color:#b08000;">1.</span>
+j = <span style="color:#b08000;">.1</span>
+k =  <span style="color:#b08000;">1</span>
+l = <span style="color:#b08000;">1_0.e+3_22</span> + <span style="color:#b08000;">.2_1e2</span> + <span style="color:#b08000;">11_1.</span>
+<span style="color:#898887;"># Complex</span>
+m = <span style="color:#006e28;">1.1E+3j</span>
+n = <span style="color:#006e28;">1.E+3j</span>
+o = <span style="color:#006e28;">.1E+3j</span>
+p = <span style="color:#006e28;">1E+3j</span>
+q = <span style="color:#006e28;">1.1j</span>
+r = <span style="color:#006e28;">1.j</span>
+s = <span style="color:#006e28;">.1j</span>
+t =  <span style="color:#006e28;">1j</span>
+u = <span style="color:#006e28;">1_0.e+3_22j</span> + <span style="color:#006e28;">.2_1e2j</span> + <span style="color:#006e28;">11_1.j</span>
+
+<span style="color:#898887;"># Invalid numbers</span>
+aaa.123
+aaa123
+.0x123
 </pre></body></html>
diff --git a/autotests/input/test.py b/autotests/input/test.py
--- a/autotests/input/test.py
+++ b/autotests/input/test.py
@@ -48,3 +48,35 @@
 "Escapes in Doc/Comment String \u1234 \xAb \"\\"
 ''' Doc/Comment String \N{123} \''''
 """ Doc/Comment String \17 \x1f \n \" \\"""
+
+# Decimal, Hex, Binary, Octal
+a = 1_2_34L
+b = 0_0_00_0
+c = 0xA_3f_43D
+d = 0b0_0_1_01
+e = 0o71_2_34
+# Float
+d = 1.1E+3
+e = 1.E+3
+f = .1E+3
+g = 1E+3
+h = 1.1
+i = 1.
+j = .1
+k =  1
+l = 1_0.e+3_22 + .2_1e2 + 11_1.
+# Complex
+m = 1.1E+3j
+n = 1.E+3j
+o = .1E+3j
+p = 1E+3j
+q = 1.1j
+r = 1.j
+s = .1j
+t =  1j
+u = 1_0.e+3_22j + .2_1e2j + 11_1.j
+
+# Invalid numbers
+aaa.123
+aaa123
+.0x123
diff --git a/autotests/reference/test.py.ref b/autotests/reference/test.py.ref
--- a/autotests/reference/test.py.ref
+++ b/autotests/reference/test.py.ref
@@ -8,9 +8,9 @@
 <Operator>//</Operator><Normal Text> alert check, no word delimiter check at start of word, bug </Normal Text><Int>397719</Int><br/>
 <Comment>#</Comment><Alert Level 2>TODO</Alert Level 2><br/>
 <Normal Text></Normal Text><br/>
-<Normal Text>a </Normal Text><Operator>=</Operator><Int> 100_000</Int><br/>
-<Normal Text>b </Normal Text><Operator>=</Operator><Int> 856_264</Int><Normal Text>.</Normal Text><Int>65</Int><br/>
-<Normal Text>c </Normal Text><Operator>=</Operator><Hex> 0x420_F52</Hex><br/>
+<Normal Text>a </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Int>100_000</Int><br/>
+<Normal Text>b </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Float>856_264.65</Float><br/>
+<Normal Text>c </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Hex>0x420_F52</Hex><br/>
 <Normal Text></Normal Text><br/>
 <Definition Keyword>def</Definition Keyword><Normal Text> func(x):</Normal Text><br/>
 <Normal Text>    </Normal Text><Comment>""" EXTENDED API docs """</Comment><br/>
@@ -23,7 +23,7 @@
 <Normal Text>            }</Normal Text><br/>
 <Normal Text>        a1 </Normal Text><Operator>=</Operator><Normal Text> []</Normal Text><br/>
 <Normal Text>        a2 </Normal Text><Operator>=</Operator><Normal Text> [</Normal Text><br/>
-<Normal Text>            </Normal Text><String>"a"</String><Normal Text>, </Normal Text><Octal>032</Octal><Normal Text>, (</Normal Text><br/>
+<Normal Text>            </Normal Text><String>"a"</String><Normal Text>, 032, (</Normal Text><br/>
 <Normal Text>                )]</Normal Text><br/>
 <Normal Text>    </Normal Text><Flow Control Keyword>else</Flow Control Keyword><Normal Text>:</Normal Text><br/>
 <Normal Text>        </Normal Text><Builtin Function>print</Builtin Function><Normal Text>(</Normal Text><String>"""multi</String><br/>
@@ -48,3 +48,35 @@
 <Comment>"Escapes in Doc/Comment String </Comment><String Char>\u1234</String Char><Comment> </Comment><String Char>\xAb</String Char><Comment> </Comment><String Char>\"\\</String Char><Comment>"</Comment><br/>
 <Comment>''' Doc/Comment String </Comment><String Char>\N{123}</String Char><Comment> </Comment><String Char>\'</String Char><Comment>'''</Comment><br/>
 <Comment>""" Doc/Comment String </Comment><String Char>\17</String Char><Comment> </Comment><String Char>\x1f</String Char><Comment> </Comment><String Char>\n</String Char><Comment> </Comment><String Char>\"</String Char><Comment> </Comment><String Char>\\</String Char><Comment>"""</Comment><br/>
+<Normal Text></Normal Text><br/>
+<Comment># Decimal, Hex, Binary, Octal</Comment><br/>
+<Normal Text>a </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Int>1_2_34L</Int><br/>
+<Normal Text>b </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Int>0_0_00_0</Int><br/>
+<Normal Text>c </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Hex>0xA_3f_43D</Hex><br/>
+<Normal Text>d </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Binary>0b0_0_1_01</Binary><br/>
+<Normal Text>e </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Octal>0o71_2_34</Octal><br/>
+<Comment># Float</Comment><br/>
+<Normal Text>d </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Float>1.1E+3</Float><br/>
+<Normal Text>e </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Float>1.E+3</Float><br/>
+<Normal Text>f </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Float>.1E+3</Float><br/>
+<Normal Text>g </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Float>1E+3</Float><br/>
+<Normal Text>h </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Float>1.1</Float><br/>
+<Normal Text>i </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Float>1.</Float><br/>
+<Normal Text>j </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Float>.1</Float><br/>
+<Normal Text>k </Normal Text><Operator>=</Operator><Normal Text>  </Normal Text><Int>1</Int><br/>
+<Normal Text>l </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Float>1_0.e+3_22</Float><Normal Text> </Normal Text><Operator>+</Operator><Normal Text> </Normal Text><Float>.2_1e2</Float><Normal Text> </Normal Text><Operator>+</Operator><Normal Text> </Normal Text><Float>11_1.</Float><br/>
+<Comment># Complex</Comment><br/>
+<Normal Text>m </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Complex>1.1E+3j</Complex><br/>
+<Normal Text>n </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Complex>1.E+3j</Complex><br/>
+<Normal Text>o </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Complex>.1E+3j</Complex><br/>
+<Normal Text>p </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Complex>1E+3j</Complex><br/>
+<Normal Text>q </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Complex>1.1j</Complex><br/>
+<Normal Text>r </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Complex>1.j</Complex><br/>
+<Normal Text>s </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Complex>.1j</Complex><br/>
+<Normal Text>t </Normal Text><Operator>=</Operator><Normal Text>  </Normal Text><Complex>1j</Complex><br/>
+<Normal Text>u </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><Complex>1_0.e+3_22j</Complex><Normal Text> </Normal Text><Operator>+</Operator><Normal Text> </Normal Text><Complex>.2_1e2j</Complex><Normal Text> </Normal Text><Operator>+</Operator><Normal Text> </Normal Text><Complex>11_1.j</Complex><br/>
+<Normal Text></Normal Text><br/>
+<Comment># Invalid numbers</Comment><br/>
+<Normal Text>aaa.123</Normal Text><br/>
+<Normal Text>aaa123</Normal Text><br/>
+<Normal Text>.0x123</Normal Text><br/>
diff --git a/data/syntax/python.xml b/data/syntax/python.xml
--- a/data/syntax/python.xml
+++ b/data/syntax/python.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language>
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+	<!ENTITY digitPart "[0-9](?:_?[0-9])*">
+	<!ENTITY beforeDigit "(?&lt;![\.\w[:^ascii:]])">
+	<!ENTITY beforePointFloat "(?&lt;![\w[:^ascii:]])">
+]>
 <!-- Python syntax highlightning v0.9 by Per Wigren -->
 <!-- Python syntax highlighting v1.9 by Michael Bueker (improved keyword differentiation) -->
 <!-- Python syntax highlighting v1.97 by Paul Giannaros -->
@@ -14,7 +19,7 @@
 <!-- v2.07 add support for %prog and co, see bug 142832 -->
 <!-- v2.08 add missing overloaders, new Python 3 statements, builtins, and keywords -->
 <!-- v2.29 recognize escape sequenzes correctly -->
-<language name="Python" version="9" style="python" indenter="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license="">
+<language name="Python" version="10" style="python" indenter="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license="">
 	<highlighting>
 		<list name="import">
 			<item>import</item>
@@ -65,6 +70,7 @@
 			<item>ascii</item>
 			<item>basestring</item>
 			<item>bin</item>
+			<item>breakpoint</item>
 			<item>bool</item>
 			<item>buffer</item>
 			<item>bytearray</item>
@@ -342,15 +348,17 @@
 				<keyword attribute="Overloaders" String="overloaders" context="#stay"/>
 				<RegExpr attribute="Normal Text" String="[a-zA-Z_][a-zA-Z_0-9]{2,}" context="#stay"/>
 
-				<RegExpr attribute="Complex" String=" ((([0-9]*\.[0-9]+|[0-9]+\.)|([0-9]+|([0-9]*\.[0-9]+|[0-9]+\.))[eE](\+|-)?[0-9]+)|[0-9]+)[jJ]" context="#stay"/>
-				<Float attribute="Float" context="#stay" />
-				<HlCHex attribute="Hex" context="#stay"/>
-				<HlCOct attribute="Octal" context="#stay"/>
-				<Int attribute="Int" context="Int Suffixes"/>
-
-				<RegExpr attribute="Int" String=" ([0-9]+_)+[0-9]+" context="#stay"/>
-				<RegExpr attribute="Float" String=" ([0-9]+_)+[0-9]+\.[0-9]+" context="#stay"/>
-				<RegExpr attribute="Hex" String=" [0-9]x([A-F0-9]+_)+[A-F0-9]+" context="#stay"/>
+				<!-- Complex: 1j ; 1.1j ; 1.j ; .1j ; 1e3j ; 1.1e3j ; 1.e3j ; .1e3j -->
+				<RegExpr attribute="Complex" String="(?:&beforeDigit;&digitPart;(?:\.(?:&digitPart;)?)?|&beforePointFloat;\.&digitPart;)(?:[eE][\+\-]?&digitPart;)?[jJ]\b" context="#stay"/>
+				<!-- Hexadecimal: 0xA1, Binary: 0b01, Octal: 0o71 -->
+				<RegExpr attribute="Hex" String="&beforeDigit;0[xX](?:_?[\da-fA-F])+\b" context="#stay"/>
+				<RegExpr attribute="Binary" String="&beforeDigit;0[bB](?:_?[01])+\b" context="#stay"/>
+				<RegExpr attribute="Octal" String="&beforeDigit;0[oO](?:_?[0-7])+\b" context="#stay"/>
+				<!-- Float: 1.1 ; 1. ; .1 ; 1e3 ; 1.1e3 ; 1.e3 ; .1e3 -->
+				<RegExpr attribute="Float" String="(?:&beforeDigit;&digitPart;(?:\.(?:&digitPart;)?)?|&beforePointFloat;\.&digitPart;)[eE][\+\-]?&digitPart;\b" context="#stay"/>
+				<RegExpr attribute="Float" String="(?:&beforeDigit;&digitPart;\.(?:&digitPart;\b)?|&beforePointFloat;\.&digitPart;\b)" context="#stay"/>
+				<!-- Decimal: 123 ; 000 -->
+				<RegExpr attribute="Int" String="&beforeDigit;(?:[1-9](?:_?\d)*|0(?:_?0)*)[lL]?\b" context="#stay"/>
 
 				<DetectChar attribute="Normal Text" char="{" context="Dictionary" beginRegion="Dictionary"/>
 				<DetectChar attribute="Normal Text" char="[" context="List" beginRegion="List"/>
@@ -362,14 +370,10 @@
 
 				<IncludeRules context="StringVariants" />
 
-				<RegExpr attribute="Decorator" String="@[_a-zA-Z][\._a-zA-Z0-9]*" firstNonSpace="true"/>
+				<RegExpr attribute="Decorator" String="@[_a-zA-Z[:^ascii:]][\._a-zA-Z0-9[:^ascii:]]*" firstNonSpace="true"/>
 				<AnyChar attribute="Operator" String="+*/%\|=;\!&lt;&gt;!^&amp;~-@" context="#stay"/>
 			</context>
 
-			<context name="Int Suffixes" attribute="Int" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
-				<StringDetect attribute="Int" context="#pop" String="L" insensitive="true"/>
-			</context>
-
 			<context name="#CheckForString" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
 				<DetectSpaces/>
 				<LineContinue attribute="Normal Text" context="CheckForStringNext"/>
@@ -661,6 +665,7 @@
 			<itemData name="Int" defStyleNum="dsDecVal" spellChecking="false"/>
 			<itemData name="Hex" defStyleNum="dsBaseN" spellChecking="false"/>
 			<itemData name="Octal" defStyleNum="dsBaseN" spellChecking="false"/>
+			<itemData name="Binary" defStyleNum="dsBaseN" spellChecking="false"/>
 			<itemData name="Complex" defStyleNum="dsOthers" spellChecking="false"/>
 			<itemData name="Comment" defStyleNum="dsComment"/>
 			<itemData name="String" defStyleNum="dsString"/>