reorganize theme templates