finxally done fixing colors