XTerm: 256 colors
Merge branch 'master' into desktop