diff --git a/lib/ace/mode/_test/tokens_ftl.json b/lib/ace/mode/_test/tokens_ftl.json
index c9a7da81..eb81f1fb 100644
--- a/lib/ace/mode/_test/tokens_ftl.json
+++ b/lib/ace/mode/_test/tokens_ftl.json
@@ -44,8 +44,9 @@
 ],[
    "start",
   ["punctuation.doctype.begin","<!"],
-  ["keyword.doctype","DOCTYPE"],
-  ["text"," html"],
+  ["meta.tag.doctype","DOCTYPE"],
+  ["text"," "],
+  ["xml-pe","html"],
   ["punctuation.doctype.end",">"]
 ],[
    "start",
diff --git a/lib/ace/mode/_test/tokens_luapage.json b/lib/ace/mode/_test/tokens_luapage.json
index 5750ec2e..3cee0815 100644
--- a/lib/ace/mode/_test/tokens_luapage.json
+++ b/lib/ace/mode/_test/tokens_luapage.json
@@ -2,8 +2,12 @@
    "doctype",
   ["text",""],
   ["punctuation.doctype.begin","<!"],
-  ["keyword.doctype","DOCTYPE"],
-  ["text"," html PUBLIC "],
+  ["meta.tag.doctype","DOCTYPE"],
+  ["text"," "],
+  ["xml-pe","html"],
+  ["text"," "],
+  ["xml-pe","PUBLIC"],
+  ["text"," "],
   ["string","\"-//W3C//DTD XHTML 1.0 Strict//EN\""]
 ],[
    "start",
diff --git a/lib/ace/mode/_test/tokens_twig.json b/lib/ace/mode/_test/tokens_twig.json
index 328b3927..c4101ded 100644
--- a/lib/ace/mode/_test/tokens_twig.json
+++ b/lib/ace/mode/_test/tokens_twig.json
@@ -1,8 +1,9 @@
 [[
    "start",
   ["punctuation.doctype.begin","<!"],
-  ["keyword.doctype","DOCTYPE"],
-  ["text"," html"],
+  ["meta.tag.doctype","DOCTYPE"],
+  ["text"," "],
+  ["xml-pe","html"],
   ["punctuation.doctype.end",">"]
 ],[
    "start",
diff --git a/lib/ace/mode/xml_highlight_rules.js b/lib/ace/mode/xml_highlight_rules.js
index ad31c8e2..dd3d2a28 100644
--- a/lib/ace/mode/xml_highlight_rules.js
+++ b/lib/ace/mode/xml_highlight_rules.js
@@ -49,7 +49,7 @@ var XmlHighlightRules = function(normalize) {
             },
             {token : "comment", regex : "<\\!--", next : "comment"},
             {
-                token : ["punctuation.doctype.begin", "keyword.doctype"],
+                token : ["punctuation.doctype.begin", "meta.tag.doctype"],
                 regex : "(<\\!)(DOCTYPE)(?=[\\s])", next : "doctype"
             },
             {include : "tag"},
@@ -69,7 +69,7 @@ var XmlHighlightRules = function(normalize) {
             {include : "space"},
             {include : "string"},
             {token : "punctuation.doctype.end", regex : ">", next : "start"},
-            {token : "text", regex : "[-_a-zA-Z0-9:]+"},
+            {token : "xml-pe", regex : "[-_a-zA-Z0-9:]+"},
             {token : "punctuation.begin", regex : "\\[", push : "declarations"}
         ],