Added ability to select both as shelf items, support has been added to Amber skin