Sync with upstream.
Set the colorscheme early.
Merge branch 'js/mine'