[enh] better highlighting