diff --git a/jade.nanorc b/jade.nanorc
index 032d9fa8..e4bb6ea3 100644
--- a/jade.nanorc
+++ b/jade.nanorc
@@ -18,9 +18,13 @@ color cyan "('[^']*')|(\"[^\"]*\")"
 # Parenthesis, commas, equals
 icolor green "\(" "\)" "\," "\="
 # Comments and spaces
-color blue "//.*"
+color blue "\s+(//.*)"
 color blue start="/\*" end="\*/"
 color ,green "[[:space:]]+$"
+# HTML-style conditional comments
+color brightmagenta "<!--(.*)>"
+# HTML-style elements
+color yellow "<([^!].*)>"
 # Pipes
 color yellow,magenta "\|"
 # Doctype
diff --git a/pug.nanorc b/pug.nanorc
index f450836c..7174bf2e 100644
--- a/pug.nanorc
+++ b/pug.nanorc
@@ -18,9 +18,13 @@ color cyan "('[^']*')|(\"[^\"]*\")"
 # Parenthesis, commas, equals
 icolor green "\(" "\)" "\," "\="
 # Comments and spaces
-color blue "//.*"
+color blue "\s+(//.*)"
 color blue start="/\*" end="\*/"
 color ,green "[[:space:]]+$"
+# HTML-style conditional comments
+color brightmagenta "<!--(.*)>"
+# HTML-style elements
+color yellow "<([^!].*)>"
 # Pipes
 color yellow,magenta "\|"
 # Doctype