Reorganize theme functions