Added: color theme, and messed about with submodule and layout