Updated to latest o-colors and linting