Improve cuc and cul highlighting