Color Scheme + Concurrency bug fixes