Fixing more button colors