Update Solarized & Clean UP