Re-add solarized as non-submodule