Fixing keybindings, breaking out aura to new file