diff --git a/lib/ace/mode/doc_comment_highlight_rules.js b/lib/ace/mode/doc_comment_highlight_rules.js
index d88a9d2d..dae35be7 100644
--- a/lib/ace/mode/doc_comment_highlight_rules.js
+++ b/lib/ace/mode/doc_comment_highlight_rules.js
@@ -49,10 +49,13 @@ var DocCommentHighlightRules = function() {
             next : "start"
         }, {
             token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+"
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
         }, {
             token : "comment.doc",
             regex : "\s+"
+        }, {
+            token : "comment.doc",
+            regex : "TODO"
         }, {
             token : "comment.doc",
             regex : "[^@\\*]+"
diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js
index cd98bde5..b8b1d006 100644
--- a/lib/ace/theme/pastel_on_dark.js
+++ b/lib/ace/theme/pastel_on_dark.js
@@ -172,11 +172,11 @@ color:#D2A8A1;\
 }\
 \
 .ace-pastel-on-dark .ace_comment.ace_doc {\
-  \
+  color:A6C6FF;\
 }\
 \
 .ace-pastel-on-dark .ace_comment.ace_doc.ace_tag {\
-  \
+  color:A6C6FF;\
 }\
 \
 .ace-pastel-on-dark .ace_variable {\