Merge "Change text color for better contrast" into main