Navring: use default text color
fix merge errors