Merge branch 'jk/colors-fix'