Color code cleanup

Colors use now vars