plugin stages
color changes
Merge branch 'master' into plugins