Feature/new colors