2b26fed Highlighting on client with no hacks