Merge "Fix style for text colour settings"