Text hilightning improved