implemented varying colours and code cleanup
Merge branch 'walport-water' into testing