more defects dealt with & theme submodule