Clean up, fixed colors