Unify tone and visual tone
Update visual tone references