Some shortcuts are not working now #193