Moved shortcut definitions to YAML
Merge branch 'shortcuts_to_yaml'