Improving colours (gamma issues) and adding test