Add proper tokens for comments.
Fix comment coloring, improve preferences preview.
Include icons in plugin build.