diff --git a/CHANGES.md b/CHANGES.md
index b1413c29a5..fe895582d2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,6 +26,7 @@ Core Grammars:
 - enh(json) add json5 support [Kerry Shetline][]
 - fix(css) `unicode-range` parsing, issue #4253 [Kerry Shetline][]
 - fix(csharp) Support digit separators [te-ing][]
+- fix(haxe) After colon, highlight non-identifiers like numbers and strings [Josh Tynjala][]
 
 Documentation:
 
@@ -55,6 +56,7 @@ CONTRIBUTORS
 [te-ing]: https://github.com/te-ing
 [Anthony Martin]: https://github.com/anthony-c-martin
 [NriotHrreion]: https://github.com/NriotHrreion
+[Josh Tynjala]: https://github.com/joshtynjala
 
 
 ## Version 11.11.1
diff --git a/src/languages/haxe.js b/src/languages/haxe.js
index 084b80263b..46ff15f2d7 100644
--- a/src/languages/haxe.js
+++ b/src/languages/haxe.js
@@ -74,7 +74,7 @@ export default function(hljs) {
       },
       {
         className: 'type', // function types
-        begin: /:[ \t]*/,
+        begin: ":[ \t]*(?=\\(|" + IDENT_RE + ")",
         end: /[^A-Za-z0-9_ \t\->]/,
         excludeBegin: true,
         excludeEnd: true,
@@ -82,7 +82,7 @@ export default function(hljs) {
       },
       {
         className: 'type', // types
-        begin: /:[ \t]*/,
+        begin: ":[ \t]*(?=" + IDENT_RE + ")",
         end: /\W/,
         excludeBegin: true,
         excludeEnd: true
diff --git a/test/markup/haxe/default.expect.txt b/test/markup/haxe/default.expect.txt
index 72d1b25922..3c2b98a000 100644
--- a/test/markup/haxe/default.expect.txt
+++ b/test/markup/haxe/default.expect.txt
@@ -98,11 +98,11 @@
         <span class="hljs-comment">// switch statements!</span>
         <span class="hljs-keyword">var</span> c:<span class="hljs-type">Color </span>= Color.Green;
         <span class="hljs-keyword">var</span> x:<span class="hljs-type">Int </span>= <span class="hljs-keyword">switch</span>(c) {
-            <span class="hljs-keyword">case</span> Red: <span class="hljs-type">0</span>;
-            <span class="hljs-keyword">case</span> Green: <span class="hljs-type">1</span>;
-            <span class="hljs-keyword">case</span> Blue: <span class="hljs-type">2</span>;
-            <span class="hljs-keyword">case</span> Rgb(r, g, b): <span class="hljs-type">3</span>;
-            <span class="hljs-keyword">case</span> <span class="hljs-literal">_</span>: <span class="hljs-type">-1</span>;
+            <span class="hljs-keyword">case</span> Red: <span class="hljs-number">0</span>;
+            <span class="hljs-keyword">case</span> Green: <span class="hljs-number">1</span>;
+            <span class="hljs-keyword">case</span> Blue: <span class="hljs-number">2</span>;
+            <span class="hljs-keyword">case</span> Rgb(r, g, b): <span class="hljs-number">3</span>;
+            <span class="hljs-keyword">case</span> <span class="hljs-literal">_</span>: <span class="hljs-number">-1</span>;
         }
 
         <span class="hljs-keyword">for</span>(i <span class="hljs-keyword">in</span> <span class="hljs-number">0.</span>.<span class="hljs-number">.3</span>) {
@@ -139,21 +139,24 @@
 
     <span class="hljs-keyword">private</span> <span class="hljs-keyword">inline</span> <span class="hljs-title function_"><span class="hljs-keyword">function</span> <span class="hljs-title">func</span></span>(a:<span class="hljs-type">Int</span>, b:<span class="hljs-type">Float</span>, ?c:<span class="hljs-type">String</span>, d:<span class="hljs-type">Bool</span>=<span class="hljs-literal">false</span>):<span class="hljs-type">Dynamic </span>{
         <span class="hljs-keyword">return</span> {
-            x: <span class="hljs-type">0</span>,
+            x: <span class="hljs-number">0</span>,
             y: <span class="hljs-type">true</span>,
             z: <span class="hljs-type">false</span>,
 
-            a: <span class="hljs-type">1</span>.<span class="hljs-number">53</span>,
-            b: <span class="hljs-type">5e10</span>,
-            c: <span class="hljs-type">-12</span>,
-            d: <span class="hljs-type">1_0_0_0_0</span>,
+            a: <span class="hljs-number">1.53</span>,
+            b: <span class="hljs-number">5e10</span>,
+            c: <span class="hljs-number">-12</span>,
+            d: <span class="hljs-number">1</span>_0_0_0_0,
 
-            i: <span class="hljs-type">10000i32</span>,
-            u: <span class="hljs-type">2147483648u32</span>,
-            l: <span class="hljs-type">10000000000i64</span>,
-            f: <span class="hljs-type">5f64</span>,
+            i: <span class="hljs-number">10000i32</span>,
+            u: <span class="hljs-number">2147483648u32</span>,
+            l: <span class="hljs-number">10000000000i64</span>,
+            f: <span class="hljs-number">5f64</span>,
 
             n: <span class="hljs-type">null</span>,
+
+            s1: <span class="hljs-string">&quot;double&quot;</span>,
+            s2: <span class="hljs-string">&#x27;single&#x27;</span>,
         };
     }
 
diff --git a/test/markup/haxe/default.txt b/test/markup/haxe/default.txt
index 4c11b45d2e..689cecf0a6 100644
--- a/test/markup/haxe/default.txt
+++ b/test/markup/haxe/default.txt
@@ -154,6 +154,9 @@ class Main extends BaseClass implements SomeFunctionality {
             f: 5f64,
 
             n: null,
+
+            s1: "double",
+            s2: 'single',
         };
     }