refactoring theme