Tweaked shortcuts
Merge and update
Shortcut tweaks