Changed color scheme to solarized.
Some cleanup and reorganization as well.