Fix color coding in output funcs (again)