Add the new Daydream strings and do some cleanup