added enum pattern for shape fill types