Add color for Trace and fix yellow for Waring