rechanged the text colors
merged