added xmodmap for uk qwerty, some renames