Update prior to splitting into separate deconstruction and restyling plugins