More color support and other improvements