new colors + styling cleanup