Add blocks added with 1.6, DRY up color variation setting
Merge pull request #85 from shaneriley/master

Add blocks added with 1.6, DRY up color variation setting