Merge branch 'jk/colors' into maint