Fixed a bug where default and color blind colors were mixing
Merge branch 'staging' into katana