Colores parte 2
Merge branch 'Ricardo'
Some visual change