Merge branch 'jc/addi-color'