fixed terminal types
Merge branch 'master' into feature/themes