Merge branch 'jc/color-attrs'