Reorganizing theme names