update colors and fix shapes