Various

Addon shortcut handling revised. Not complete.