Add more colors to fix pb with agenda
Fix: Clean data