#132 extended and changed shortcuts as discussed