Add solarized color scheme support.
Resolve merge conflicts