Reorganizing and adding new themes