refactoring theme 1.0