new colors + style clean up