some breaking changes to everything not in "Hotkeys"