Fix/highlighter

Supersedes and closes #111