Update o-colors refs, maintaining compat with >=2.3
Fixed merge conflicts