Further cleanup of navbar colors