Moved shade variables above colour variables
Added whitespace
Merge pull request #5837 from andy-saint/master

Moved gray shade variables above colour variables