Improve color schema
Improve color schema