Re-add XcodeColors, per async shell fixes