colores 3
Some light changes
Merge branch 'Ricardo'
SOme final changes