Updated to latest o-colors