Theme updates to deal with changes to Wave