Adding changes from hydrozen's fork of solarized