Fixed plugin to work with latest beta + added keymap