themes  refactoring