Refactoring theme