more shortcuts. some colour changes for vimdiff.