Fix for #1 Color issues.
Revert "Fix for #1 Color issues."

This reverts commit e08de7405731ead48aaa42379d64cc2509a04998.
Revert "Revert "Fix for #1 Color issues.""

This reverts commit 173fcedda39c5ae240f1b389f3e8b970e37aa594.