refactor theme with new EOLE theme