consolidate style pickers to single class

Consolidate fill, line, marker style pickers to a single class.