Refactor DECORATE and shop items