finished colors
Merge branch 'color-syntax'