Update for solarized and clang.