Fixed an issue where the wrong colors were being set and cleared