Modify themes to work with latest changes.