Color update, cleanup