+ Some highlight state modifications