Refactored theme