Update scenes to new format