Tidy up the rainbow a little