Updating solarized from upstream