fixes fill color on shapes; refactor to remove g child element