few colour changes
Merges