Rework highlighting for markdown