Reverting stupid changes to Fill and Outline