Updating to match theme edits