merge in update theme files, fix issues associated with update