Fixed scope names
Wrap selection in comment
Fixed shortcuts/triggers