Removed unnecessary chrome; make return also indent to appropriate level; update base16 submodule to HEAD