Add custom keybinding minor mode and fix upstream bug