Solarized

merging