better terminal colors
Merge branch 'terminal'