Merge branch 'hotfix/hotfix'
Colors fix
Merge branch 'hotfix/hotfix' into develop