Fix folder hooks and movement keys