Putting back the theme w/o the submodule