More color fixes to add buttons

oops! now buttons should work properly in all cases. I think.