Custom sort order support, remove duplicate keymap files, update menu