Merge "Adapted the header colors to spec"