Updates TimeSteps and Colors
Merge branch 'PreCookie'