Refactoring and theme