corrected format for colours
Merge branch 'refs/heads/feature-color-inputfield'