Fixes for indentation and the possibility that the solarized variable won't be there