Changed type to enum for presence colour attributes
Merge branch 'master' into plugins