Change colors to solarized.
Fix merge conflicts from merging master.