Modified solarized scheme; And lots of minor changes