Refactored modern theme