Implement nickname highlighting as outlined in #443