Color changes, cleanup