Moving rest of the color logic out of the colors module