Added more submodules, custom colors