update highlight color; clean up