Refactored styles definitions