update colors + naming