Final fixes to button colors