fix mac keymap, merge preferences file~