add highlighting to new content
Merge branch 'master' into feature/flip-discussion