Fixed for latest beta + added keymap and simplified settings