Merge branch 'color-functions'