more color cleanups