Reorganized keybindings and environmental logic