re-enable the solarized theme and fix setup order