removed theme as submodule, build as one