Updated to pull correct color values