switch to light colors; some changes