Separation of highlight and state