colour changes fixes #597
Merge branch 'grants_wizard' into testing