Vim: new maps;
i3: new colorschemes
Vim: merge configs