diff --git a/runtime/syntax/html.yaml b/runtime/syntax/html.yaml
index 16df6586..d17ec7f0 100644
--- a/runtime/syntax/html.yaml
+++ b/runtime/syntax/html.yaml
@@ -1,13 +1,13 @@
 filetype: html
 
-detect: 
+detect:
     filename: "\\.htm[l]?$"
 
 rules:
     - error: "<[^!].*?>"
     - symbol.tag: "(?i)<[/]?(a(bbr|cronym|ddress|pplet|rea|rticle|side|udio)?|b(ase(font)?|d(i|o)|ig|lockquote|r)?|ca(nvas|ption)|center|cite|co(de|l|lgroup)|d(ata(list)?|d|el|etails|fn|ialog|ir|l|t)|em(bed)?|fieldset|fig(caption|ure)|font|form|(i)?frame|frameset|h[1-6]|hr|i|img|in(put|s)|kbd|keygen|label|legend|li(nk)?|ma(in|p|rk)|menu(item)?|met(a|er)|nav|no(frames|script)|o(l|pt(group|ion)|utput)|p(aram|icture|re|rogress)?|q|r(p|t|uby)|s(trike)?|samp|se(ction|lect)|small|source|span|strong|su(b|p|mmary)|textarea|time|track|u(l)?|var|video|wbr)( .*|>)*?>"
     - symbol.tag.extended: "(?i)<[/]?(body|div|html|head(er)?|footer|title|table|t(body|d|h(ead)?|r|foot))( .*)*?>"
-    - special: "&[^;[[:space:]]]*;"
+    - special: "&(#[[:digit:]]{1,4}|#x[[:xdigit:]]{1,4}|[^[[:space:]]]+);"
     - symbol: "[:=]"
     - identifier: "(alt|bgcolor|height|href|id|label|longdesc|name|on(click|focus|load|mouseover)|size|span|src|target|type|value|width)="
     - constant.number: "(?i)#[0-9A-F]{6,6}"
@@ -45,4 +45,3 @@ rules:
         limit-group: symbol.tag
         rules:
             - include: "css"
-
diff --git a/runtime/syntax/xml.yaml b/runtime/syntax/xml.yaml
index dbc99512..d9b0111c 100644
--- a/runtime/syntax/xml.yaml
+++ b/runtime/syntax/xml.yaml
@@ -1,16 +1,32 @@
 filetype: xml
 
 detect:
-    filename: "\\.(xml|sgml?|rng|plist)$"
+    filename: "\\.(xml|sgml?|rng|svg|plist)$"
+    header: "<\\?xml.*\\?>"
 
 rules:
-    - identifier: "<.*?>"
-    - comment:
+    - preproc:
         start: "<!DOCTYPE"
         end: "[/]?>"
         rules: []
-    - comment: 
-        start: "<!--"
-        end: "-->"
-        rules: []
-    - special: "&[^;]*;"
+    - comment: "<!--.+?-->"
+    - symbol.tag:
+        start: "<\\??"
+        end: "\\??>"
+        rules:
+            - identifier:
+                start: " "
+                end: "="
+                rules: []
+            - constant.string:
+                start: "\""
+                end: "\""
+                skip: "\\\\."
+                rules:
+                    - constant.specialChar: "\\\\."
+            - constant.string:
+                start: "'"
+                end: "'"
+                skip: "\\\\."
+                rules:
+                    - constant.specialChar: "\\\\."