Refactoring default theme