Merge "Adjust outline color for better contrast" into main