Merge branch 'jk/colors'