try to merge with mediator theme