First draft of support for fill style