Patched local changes of some files for elscreen