Updated colors; still need to fix buttons