fixed term to work better with white screens
Merge branch 'master' into mac