Fix Shortcuts (or at least - should)
Closes #38