Update submodules
Merge branch 'master' into submoduleupdate
Add colorscheme.