Merge branch 'dm/color-palette'