Update shortcut structure and add in new shortcuts that are created programmatically