diff --git a/php.nanorc b/php.nanorc
index 693695f9..9be89424 100644
--- a/php.nanorc
+++ b/php.nanorc
@@ -5,7 +5,7 @@ comment "//"
 color white start="<\?(php|=)?" end="\?>"
 # Constructs
 color brightblue "(class|extends|goto) ([a-zA-Z0-9_]*)"
-color brightblue "[^a-z0-9_-]{1}(var|class|function|echo|case|break|default|exit|switch|if|else|elseif|endif|foreach|endforeach|@|while|public|private|protected|return|true|false|null|TRUE|FALSE|NULL|const|static|extends|as|array|require|include|require_once|include_once|define|do|continue|declare|goto|print|in|namespace|use)[^a-z0-9_-]{1}"
+color brightblue "[^a-z0-9_-]{1}(var|class|function|echo|case|break|default|exit|switch|if|else|elseif|endif|foreach|endforeach|@|while|public|private|protected|return|const|static|extends|as|array|require|include|require_once|include_once|define|do|continue|declare|goto|print|in|namespace|use)[^a-z0-9_-]{1}"
 color brightblue "[a-zA-Z0-9_]+:"
 # Variables
 color green "\$[a-zA-Z_0-9$]*|[=!<>]"
@@ -14,7 +14,7 @@ color green "\->[a-zA-Z_0-9$]*|[=!<>]"
 color brightblue "([a-zA-Z0-9_-]*)\("
 # Special values
 color brightmagenta "[^a-z0-9_-]{1}(true|false|null|TRUE|FALSE|NULL)$"
-color brightmagenta "[^a-z0-9_-]{1}(true|false|null|TRUE|FALSE|NULL)[^a-z0-9_-]{1}"
+color brightmagenta "[^a-z0-9_-]{1}(true|false|null|TRUE|FALSE|NULL)[^A-Za-z0-9_-]{1}"
 # Special Characters
 color yellow "[.,{}();]"
 color cyan "\["
diff --git a/xml.nanorc b/xml.nanorc
index 809a0484..6d4e8f0a 100644
--- a/xml.nanorc
+++ b/xml.nanorc
@@ -7,9 +7,16 @@ magic "(XML|SGML) (sub)?document"
 comment "<!--|-->"
 
 color white "^.+$"
+# Attributes
 color green  start="<" end=">"
-color cyan   "<[^> ]+"
-color cyan   ">"
+color brightgreen "=\"[^\"]*\""
+# Opening tags
+color brightcyan   "<[^/][^> ]*"
+color brightcyan   ">"
+# Closing tags
+color cyan "</[^> ]*>"
+# Self-closing part
+color cyan "/>"
 color yellow start="<!DOCTYPE" end="[/]?>"
 color yellow start="<!--" end="-->"
 color red    "&[^;]*;"
diff --git a/yaml.nanorc b/yaml.nanorc
index f202cd8e..de89e76c 100644
--- a/yaml.nanorc
+++ b/yaml.nanorc
@@ -15,7 +15,7 @@ color yellow "(^| )!!(binary|bool|float|int|map|null|omap|seq|set|str) "
 
 # Separator
 color brightwhite "^\s+-"
-color brightwhite ":(\s|\t|$)"
+color brightwhite ":(\s|$)"
 
 # Comments
 color brightblue "(^|[[:space:]])#.*$"