merge with workrefactoring - vim and Xresources