Add Solarized and fix aliases