Partial revert of c203094 for better screen colors