replaced color name and a little adapter refactorization