Finished movement and ensured all colors are ok

The update didn't break anything and the movement works ok. Will work on
that later.