Move colored out of dev/test group
Fix merge conflicts