Refactor
Fix missing Boolean
Add new keybind