refactored themes