Use solarized and more cleanup