changed color scheme, fixed bug