Merge branch 'new-colors' of https://github.com/RicardoJunior88/salamandradevs into...