Switch to KeyStroke, fix pause/unpause