updated color styles and fixed a few bugs