Fixed solarized and the highlighting issues