Adding back in colors that were lost in merge