Fix more discrepancies between nav bar tags and theme.