Fixed some naming bugs and changed highlight color