Resolve #15 - Add atom highlighter