Fixed highlighter and reimplemented dictionary