Add mate-terminal + misc changes