theme concept refactored