Everton have come to terms on a new contract for Idrissa Gana Gueye.