Base theme refactoring