some colors
Merge branch 'my'