Replace keywords fill and stroke with fill-box and stroke-box.