New theme and refactoring