Unified Markers

We now have a unified set of markers.