Update for new themes