Allow independent control of color & visibility

* Added concept of `visibility` and `colorScheme` instead of
  grouping them both under `visibility`.