Colors changes
Bugs fixing