refactor keyboard hotkeys
added more options for tracking